Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #3614 - Log if a active user (in UI) has been logged out due to SessionTimeout.

Browse source
This commit is contained in:
Rolf Schmidt 2021-07-02 06:22:43 +00:00 committed by Thorsten Eckel
parent d2e1229335
commit 651f4e819e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/jobs/session_timeout_job/session.rb
View file

@ -3,8 +3,6 @@
class SessionTimeoutJob::Session class SessionTimeoutJob::Session
attr_accessor :session, :user attr_accessor :session, :user
delegate :destroy, to: :session
def initialize(session) def initialize(session)
@session = session @session = session
@user = User.find_by(id: session.data['user_id']) @user = User.find_by(id: session.data['user_id'])
@ -15,7 +13,6 @@ class SessionTimeoutJob::Session
end end
def active? def active?
return true if !user?
return true if timeout < 1 return true if timeout < 1
return true if session.data['ping'] > timeout.seconds.ago return true if session.data['ping'] > timeout.seconds.ago
end end
@ -27,7 +24,13 @@ class SessionTimeoutJob::Session
end end
def timeout def timeout
@timeout ||= begin return -1 if !user?
timeout_user
end
def timeout_user
@timeout_user ||= begin
permissions = Permission.where(id: user.permissions_with_child_ids).pluck(:name) permissions = Permission.where(id: user.permissions_with_child_ids).pluck(:name)
result = -1 result = -1
@ -50,4 +53,9 @@ class SessionTimeoutJob::Session
def config def config
Setting.get('session_timeout') Setting.get('session_timeout')
end end
def destroy
session.destroy
Rails.logger.info "SessionTimeoutJob removed session '#{session.id}' for user id '#{user&.id}' (last ping: '#{session.data['ping']}', timeout: '#{timeout.seconds}')"
end
end end