tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #2619 - When redis feed is empty, fall back to database (#3721)

Browse Source 
* Fix #2619 - When redis feed is empty, fall back to database

* Use redis value to return feed from database only while RegenerationWorker
hasn't finished running

* Fix specs

* Replace usage of reject!
This commit is contained in:
Eugen Rochko
2017-06-14 13:37:03 +02:00
committed by GitHub
parent 0f52e42c2d
commit dc8a6244fc
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/concerns/user_tracking_concern.rb
View File

@ -17,7 +17,7 @@ module UserTrackingConcern
current_user.update_tracked_fields!(request)
# Regenerate feed if needed
RegenerationWorker.perform_async(current_user.account_id) if user_needs_feed_update?
regenerate_feed! if user_needs_feed_update?
end
def user_needs_sign_in_update?
@ -27,4 +27,9 @@ module UserTrackingConcern
def user_needs_feed_update?
current_user.last_sign_in_at < REGENERATE_FEED_DAYS.days.ago
end
def regenerate_feed!
Redis.current.setnx("account:#{current_user.account_id}:regeneration", true) == 1 && Redis.current.expire("account:#{current_user.account_id}:regeneration", 3_600 * 24)
RegenerationWorker.perform_async(current_user.account_id)
end
end