Skip to content

Commit

Permalink
Use service to clean sessions (opf#17383)
Browse files Browse the repository at this point in the history
* Use service to clean sessions

* Update app/services/sessions/clear_old_sessions_service.rb

Co-authored-by: Klaus Zanders <[email protected]>

---------

Co-authored-by: Klaus Zanders <[email protected]>
  • Loading branch information
oliverguenther and klaustopher authored Dec 8, 2024
1 parent b48c18a commit ec169ae
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 7 deletions.
39 changes: 39 additions & 0 deletions app/services/sessions/clear_old_sessions_service.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See COPYRIGHT and LICENSE files for more details.
#++
module Sessions
class ClearOldSessionsService
class << self
##
# Drop all sessions for the given user
def call!(days_ago: 30)
# sessions expire after 30 days of inactivity by default
ActiveRecord::SessionStore::Session.where("updated_at < ?", days_ago.days.ago).delete_all
end
end
end
end
2 changes: 1 addition & 1 deletion app/workers/cron/clear_old_sessions_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ClearOldSessionsJob < ApplicationJob
include ::RakeJob

def perform
super("db:sessions:expire", 7)
Sessions::ClearOldSessionsService.call!
end
end
end
8 changes: 2 additions & 6 deletions lib/tasks/database.rake
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,8 @@
namespace "db:sessions" do
desc "Expire old sessions from the sessions table"
task :expire, [:days_ago] => [:environment, "db:load_config"] do |_task, args|
# sessions expire after 30 days of inactivity by default
days_ago = Integer(args[:days_ago] || 30)
expiration_time = Date.today - days_ago.days

sessions_table = ActiveRecord::SessionStore::Session.table_name
ActiveRecord::Base.connection.execute "DELETE FROM #{sessions_table} WHERE updated_at < '#{expiration_time}'"
days_ago = args.key?(:days_ago) ? args[:days_ago].to_i : 30
Sessions::ClearOldSessionsService.call!(days_ago:)
end
end

Expand Down

0 comments on commit ec169ae

Please sign in to comment.