github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-07 13:24:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Logs notice was not displaying the right Date.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-08-02 12:40:28 +08:00
parent bf683178a8
commit dc2dae2cc4
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/services/logs-notice.js.es6
View File

@ -28,8 +28,7 @@ const LogsNotice = Ember.Object.extend({
this.set('text', this.set('text',
I18n.t(`logs_error_rate_notice.${translationKey}`, { I18n.t(`logs_error_rate_notice.${translationKey}`, {
relativeAge: autoUpdatingRelativeAge(new Date), relativeAge: autoUpdatingRelativeAge(new Date(data.publish_at * 1000)),
timestamp: moment().format("YYYY-MM-DD H:mm:ss"),
siteSettingRate: I18n.t('logs_error_rate_notice.rate', { count: siteSettingLimit, duration: duration }), siteSettingRate: I18n.t('logs_error_rate_notice.rate', { count: siteSettingLimit, duration: duration }),
rate: I18n.t('logs_error_rate_notice.rate', { count: rate, duration: duration }), rate: I18n.t('logs_error_rate_notice.rate', { count: rate, duration: duration }),
url: Discourse.getURL('/logs') url: Discourse.getURL('/logs')

4
config/initializers/100-logster.rb
View File

@ -74,7 +74,7 @@ RailsMultisite::ConnectionManagement.each_connection do
if (error_rate_per_minute || 0) > 0 if (error_rate_per_minute || 0) > 0
store.register_rate_limit_per_minute(severities, error_rate_per_minute) do |rate| store.register_rate_limit_per_minute(severities, error_rate_per_minute) do |rate|
MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'minute' }) MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'minute', publish_at: Time.current.to_i })
end end
end end
@ -82,7 +82,7 @@ RailsMultisite::ConnectionManagement.each_connection do
if (error_rate_per_hour || 0) > 0 if (error_rate_per_hour || 0) > 0
store.register_rate_limit_per_hour(severities, error_rate_per_hour) do |rate| store.register_rate_limit_per_hour(severities, error_rate_per_hour) do |rate|
MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'hour' }) MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'hour', publish_at: Time.current.to_i })
end end
end end
end end