kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Used named parameter for refreshing usage data

Browse source
This commit is contained in:
Stan Hu 2016-10-19 14:29:01 -07:00 committed by Rémy Coutable
parent bca368990a
commit f30a46b401
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/workers/gitlab_usage_ping_worker.rb
View file

@ -15,7 +15,7 @@ class GitlabUsagePingWorker
begin begin
HTTParty.post(url, HTTParty.post(url,
body: Gitlab::UsageData.to_json(true), body: Gitlab::UsageData.to_json(force_refresh: true),
headers: { 'Content-type' => 'application/json' } headers: { 'Content-type' => 'application/json' }
) )
rescue HTTParty::Error => e rescue HTTParty::Error => e

8
lib/gitlab/usage_data.rb
View file

@ -3,16 +3,16 @@ module Gitlab
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
class << self class << self
def data(force_refresh = false) def data(force_refresh: false)
Rails.cache.fetch('usage_data', force: force_refresh) { uncached_data } Rails.cache.fetch('usage_data', force: force_refresh, expires_in: 2.weeks) { uncached_data }
end end
def uncached_data def uncached_data
license_usage_data.merge(system_usage_data) license_usage_data.merge(system_usage_data)
end end
def to_json(force_refresh = false) def to_json(force_refresh: false)
data(force_refresh).to_json data(force_refresh: force_refresh).to_json
end end
def system_usage_data def system_usage_data

1
spec/workers/gitlab_usage_ping_worker_spec.rb
View file

@ -8,6 +8,7 @@ describe GitlabUsagePingWorker do
stub_request(:post, "https://version.gitlab.com/usage_data"). stub_request(:post, "https://version.gitlab.com/usage_data").
to_return(status: 200, body: '', headers: {}) 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).to receive(:try_obtain_lease).and_return(true)
expect(subject.perform.response.code.to_i).to eq(200) expect(subject.perform.response.code.to_i).to eq(200)