Version checks: tolerate old version check data that can happen immediately after upgrading but forgetting to restart sidekiq/clockwork. Don't cache version check data along with other dashboard data.

This commit is contained in:
Neil Lalonde
2013-07-30 12:11:51 -04:00
parent fc25da09e3
commit 06140740d0
5 changed files with 40 additions and 8 deletions

View File

@ -4,6 +4,7 @@ class Admin::DashboardController < Admin::AdminController
dashboard_data = Rails.cache.fetch("admin-dashboard-data-#{Discourse::VERSION::STRING}", expires_in: 1.hour) do
AdminDashboardData.fetch_all.as_json
end
dashboard_data.merge!({version_check: DiscourseUpdates.check_version.as_json}) if SiteSetting.version_checks?
render json: dashboard_data
end