diff options
| author | Jeremy Kescher <jeremy@kescher.at> | 2022-07-07 01:14:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-07 03:14:28 +0200 |
| commit | 25e076505ebe735cb3819ae8675b734d4f1c49aa (patch) | |
| tree | e8d481e59ed158e08b04dd46b325e21ff0f8f6b9 | |
| parent | c9d6571da82e48ecfbbb40b63815e6dfc42bb1b3 (diff) | |
ip_cleanup_scheduler: Make IP and session retention configurable (#18757)
| -rw-r--r-- | .env.production.sample | 8 | ||||
| -rw-r--r-- | app/workers/scheduler/ip_cleanup_scheduler.rb | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/.env.production.sample b/.env.production.sample index 4fc58072f..5eecb8bde 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -67,3 +67,11 @@ S3_BUCKET=files.example.com AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= S3_ALIAS_HOST=files.example.com + +# IP and session retention +# ----------------------- +# Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml +# to be less than daily if you lower IP_RETENTION_PERIOD below two days (172800). +# ----------------------- +IP_RETENTION_PERIOD=31556952 +SESSION_RETENTION_PERIOD=31556952 diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb index 7afad2f58..8f607db03 100644 --- a/app/workers/scheduler/ip_cleanup_scheduler.rb +++ b/app/workers/scheduler/ip_cleanup_scheduler.rb @@ -3,7 +3,8 @@ class Scheduler::IpCleanupScheduler include Sidekiq::Worker - IP_RETENTION_PERIOD = 1.year.freeze + IP_RETENTION_PERIOD = ENV.fetch('IP_RETENTION_PERIOD', 1.year).to_i.seconds.freeze + SESSION_RETENTION_PERIOD = ENV.fetch('SESSION_RETENTION_PERIOD', 1.year).to_i.seconds.freeze sidekiq_options retry: 0 @@ -15,7 +16,8 @@ class Scheduler::IpCleanupScheduler private def clean_ip_columns! - SessionActivation.where('updated_at < ?', IP_RETENTION_PERIOD.ago).in_batches.destroy_all + SessionActivation.where('updated_at < ?', SESSION_RETENTION_PERIOD.ago).in_batches.destroy_all + SessionActivation.where('updated_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(ip: nil) User.where('current_sign_in_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(sign_up_ip: nil) LoginActivity.where('created_at < ?', IP_RETENTION_PERIOD.ago).in_batches.destroy_all Doorkeeper::AccessToken.where('last_used_at < ?', IP_RETENTION_PERIOD.ago).in_batches.update_all(last_used_ip: nil) |