github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 21:41:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: dashboard report date range calculations include time zone, and application request data too

Browse Source
This commit is contained in:
Neil Lalonde
2015-02-06 17:20:11 -05:00
parent 07af79c85b
commit 96b15cbba6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/application_request.rb
View File

@ -15,7 +15,7 @@ class ApplicationRequest < ActiveRecord::Base
# auto flush if older than this # auto flush if older than this
self.autoflush_seconds = 5.minutes self.autoflush_seconds = 5.minutes
self.last_flush = Time.now self.last_flush = Time.now.utc
def self.increment!(type, opts=nil) def self.increment!(type, opts=nil)
key = redis_key(type) key = redis_key(type)
@ -28,7 +28,7 @@ class ApplicationRequest < ActiveRecord::Base
return return
end end
if (Time.now - last_flush).to_i > autoflush_seconds if (Time.now.utc - last_flush).to_i > autoflush_seconds
write_cache! write_cache!
end end
end end
@ -40,7 +40,7 @@ class ApplicationRequest < ActiveRecord::Base
return return
end end
self.last_flush = Time.now self.last_flush = Time.now.utc
date = date.to_date date = date.to_date

4
app/models/report.rb
View File

@ -13,8 +13,8 @@ class Report
@data = nil @data = nil
@total = nil @total = nil
@prev30Days = nil @prev30Days = nil
@start_date ||= 1.month.ago.utc.beginning_of_day @start_date ||= 1.month.ago.beginning_of_day
@end_date ||= Time.now.utc.end_of_day @end_date ||= Time.zone.now.end_of_day
end end
def as_json(options = nil) def as_json(options = nil)