diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-08 19:05:02 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-08 19:05:02 -0500 |
| commit | 67e77f230e93b2e2ac05632a7cccdb5f26537f3b (patch) | |
| tree | 6fd9801a67dc1576e5711177fdeeac04f2622098 /app/workers/scheduler | |
| parent | 695b53b796767e307d8ce0f5d11c2a82cb85bfd5 (diff) | |
| parent | 0893b1669548858daee79ab1260fb98646a0b3fa (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.
Diffstat (limited to 'app/workers/scheduler')
| -rw-r--r-- | app/workers/scheduler/ip_cleanup_scheduler.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb index 9f1593c91..a33ca031e 100644 --- a/app/workers/scheduler/ip_cleanup_scheduler.rb +++ b/app/workers/scheduler/ip_cleanup_scheduler.rb @@ -4,8 +4,10 @@ require 'sidekiq-scheduler' class Scheduler::IpCleanupScheduler include Sidekiq::Worker + RETENTION_PERIOD = 1.year + def perform - time_ago = 5.years.ago + time_ago = RETENTION_PERIOD.ago SessionActivation.where('updated_at < ?', time_ago).destroy_all User.where('last_sign_in_at < ?', time_ago).update_all(last_sign_in_ip: nil) end |