Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/redis-session-store.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
VERSION = '0.9.1'.freeze
# Rails 3.1 and beyond defines the constant elsewhere
unless defined?(ENV_SESSION_OPTIONS_KEY)
if Rack.release.split('.').first.to_i > 1
ENV_SESSION_OPTIONS_KEY = Rack::RACK_SESSION_OPTIONS
else
ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
end
ENV_SESSION_OPTIONS_KEY = if Rack.release.split('.').first.to_i > 1
Rack::RACK_SESSION_OPTIONS
else
Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
end
end

# ==== Options
Expand Down Expand Up @@ -103,7 +103,7 @@ def load_session_from_redis(sid)
data = redis.get(prefixed(sid))
begin
data ? decode(data) : nil
rescue => e
rescue StandardError => e
destroy_session_from_sid(sid, drop: true)
on_session_load_error.call(e, sid) if on_session_load_error
nil
Expand Down