X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..51cbbe6d5a86eaf34d507ab6e666772e2ffa439c:/lib/session_persistence.rb?ds=sidebyside diff --git a/lib/session_persistence.rb b/lib/session_persistence.rb index d4dd1cc1d..0a9f1d2f1 100644 --- a/lib/session_persistence.rb +++ b/lib/session_persistence.rb @@ -25,7 +25,8 @@ module SessionPersistence # Install filter when we are included def included(controller) - controller.after_filter :persist_session + super + controller.after_action :persist_session end end @@ -41,7 +42,7 @@ module SessionPersistence # session_expires_after 1.hour # session_expires_after 2.weeks def session_expires_after(seconds) - session[session_persistence_key] = seconds + session[session_persistence_key] = seconds.to_i end # Expire the session. @@ -52,10 +53,8 @@ module SessionPersistence # Filter callback def persist_session - if session[session_persistence_key] - request.session_options[:expire_after] = session[session_persistence_key] - end - rescue + request.session_options[:expire_after] = session[session_persistence_key] if session[session_persistence_key] + rescue StandardError reset_session end end