IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3761 from tgxworld/allow_custom_dates

Browse Source 
FIX: Use custom date for redis key in `TopicViewItem.add`.
This commit is contained in:
Régis Hanol 2015-09-14 08:59:48 +02:00
commit bb2ffb7767
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/topic_view_item.rb
View File

@ -8,7 +8,8 @@ class TopicViewItem < ActiveRecord::Base
def self.add(topic_id, ip, user_id=nil, at=nil, skip_redis=false)
# Only store a view once per day per thing per user per ip
redis_key = "view:#{topic_id}:#{Date.today}"
at ||= Date.today
redis_key = "view:#{topic_id}:#{at}"
if user_id
redis_key << ":user-#{user_id}"
else
@ -19,8 +20,6 @@ class TopicViewItem < ActiveRecord::Base
skip_redis || $redis.expire(redis_key, SiteSetting.topic_view_duration_hours.hours)
TopicViewItem.transaction do
at ||= Date.today
# this is called real frequently, working hard to avoid exceptions
sql = "INSERT INTO topic_views (topic_id, ip_address, viewed_at, user_id)
SELECT :topic_id, :ip_address, :viewed_at, :user_id