Skip to content
Snippets Groups Projects
Commit f30a46b4 authored by Stan Hu's avatar Stan Hu Committed by Rémy Coutable
Browse files

Used named parameter for refreshing usage data

parent bca36899
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -15,7 +15,7 @@ class GitlabUsagePingWorker
 
begin
HTTParty.post(url,
body: Gitlab::UsageData.to_json(true),
body: Gitlab::UsageData.to_json(force_refresh: true),
headers: { 'Content-type' => 'application/json' }
)
rescue HTTParty::Error => e
Loading
Loading
Loading
Loading
@@ -3,16 +3,16 @@ module Gitlab
include Gitlab::CurrentSettings
 
class << self
def data(force_refresh = false)
Rails.cache.fetch('usage_data', force: force_refresh) { uncached_data }
def data(force_refresh: false)
Rails.cache.fetch('usage_data', force: force_refresh, expires_in: 2.weeks) { uncached_data }
end
 
def uncached_data
license_usage_data.merge(system_usage_data)
end
 
def to_json(force_refresh = false)
data(force_refresh).to_json
def to_json(force_refresh: false)
data(force_refresh: force_refresh).to_json
end
 
def system_usage_data
Loading
Loading
Loading
Loading
@@ -8,6 +8,7 @@ describe GitlabUsagePingWorker do
 
stub_request(:post, "https://version.gitlab.com/usage_data").
to_return(status: 200, body: '', headers: {})
expect(Gitlab::UsageData).to receive(:to_json).with({ force_refresh: true }).and_call_original
expect(subject).to receive(:try_obtain_lease).and_return(true)
 
expect(subject.perform.response.code.to_i).to eq(200)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment