From bca368990acdb86acf251382c191fa9b7627837a Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 4 Oct 2016 15:32:02 -0700 Subject: [PATCH] Cache the last usage data to avoid unicorn timeouts --- app/workers/gitlab_usage_ping_worker.rb | 2 +- lib/gitlab/usage_data.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/workers/gitlab_usage_ping_worker.rb b/app/workers/gitlab_usage_ping_worker.rb index 866f5d03d8b..f26a3f47dad 100644 --- a/app/workers/gitlab_usage_ping_worker.rb +++ b/app/workers/gitlab_usage_ping_worker.rb @@ -15,7 +15,7 @@ class GitlabUsagePingWorker begin HTTParty.post(url, - body: Gitlab::UsageData.to_json, + body: Gitlab::UsageData.to_json(true), headers: { 'Content-type' => 'application/json' } ) rescue HTTParty::Error => e diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 46875908fa3..02750fa02e6 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -3,16 +3,16 @@ module Gitlab include Gitlab::CurrentSettings class << self - def data - Rails.cache.fetch('usage_data', expires_in: 1.hour) { uncached_data } + def data(force_refresh = false) + Rails.cache.fetch('usage_data', force: force_refresh) { uncached_data } end def uncached_data license_usage_data.merge(system_usage_data) end - def to_json - data.to_json + def to_json(force_refresh = false) + data(force_refresh).to_json end def system_usage_data