From 407d2abea152c769f37589156fe3c57dd95418bb Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 5 Apr 2016 15:27:11 +0200 Subject: [PATCH 1/5] Use Travis.config to retrieve default values for api_builds_rate_limit --- lib/travis/api/v3/services/requests/create.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/travis/api/v3/services/requests/create.rb b/lib/travis/api/v3/services/requests/create.rb index 1d4d0978..5eee314f 100644 --- a/lib/travis/api/v3/services/requests/create.rb +++ b/lib/travis/api/v3/services/requests/create.rb @@ -1,8 +1,7 @@ module Travis::API::V3 class Services::Requests::Create < Service TIME_FRAME = 1.hour - LIMIT = 10 - private_constant :TIME_FRAME, :LIMIT + private_constant :TIME_FRAME result_type :request params "request", "user", :config, :message, :branch, :token @@ -24,9 +23,9 @@ module Travis::API::V3 def limit(repository) if repository.settings.nil? - LIMIT + Travis.config.requests_create_api_limit else - repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit || LIMIT + repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit end end From 679bbd79017ff4e10b8947c834d7459d5ad375c1 Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 5 Apr 2016 16:27:01 +0200 Subject: [PATCH 2/5] Use LIMIT constant as a backup limit number --- Gemfile | 2 +- Gemfile.lock | 6 ++---- lib/travis/api/v3/services/requests/create.rb | 7 ++++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index da99c923..fc31b22e 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.1.7' if ENV.key?('DYNO') gem 's3', github: 'travis-ci/s3' -gem 'travis-core', github: 'travis-ci/travis-core' +gem 'travis-core', github: 'travis-ci/travis-core', branch: 'cd-ar-rate-limit-on-travis-config' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-amqp', github: 'travis-ci/travis-amqp' gem 'travis-config', '~> 0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 563536fb..d425f462 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,8 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 9978518236afb520c8fff68bebe7beb62f8ad776 + revision: 76ddca556f0eb9f40daa50789223db9e18174d46 + branch: cd-ar-rate-limit-on-travis-config specs: travis-core (0.0.1) actionmailer (~> 3.2.19) @@ -388,6 +389,3 @@ DEPENDENCIES travis-yaml! unicorn yard-sinatra! - -BUNDLED WITH - 1.12.0.pre.1 diff --git a/lib/travis/api/v3/services/requests/create.rb b/lib/travis/api/v3/services/requests/create.rb index 5eee314f..ea3827de 100644 --- a/lib/travis/api/v3/services/requests/create.rb +++ b/lib/travis/api/v3/services/requests/create.rb @@ -1,7 +1,8 @@ module Travis::API::V3 class Services::Requests::Create < Service TIME_FRAME = 1.hour - private_constant :TIME_FRAME + LIMIT = 10 + private_constant :TIME_FRAME, :LIMIT result_type :request params "request", "user", :config, :message, :branch, :token @@ -23,9 +24,9 @@ module Travis::API::V3 def limit(repository) if repository.settings.nil? - Travis.config.requests_create_api_limit + Travis.config.requests_create_api_limit || LIMIT else - repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit + repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit || LIMIT end end From 11ceaed333042d65872b31f877f9169aa36594ff Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 5 Apr 2016 16:47:33 +0200 Subject: [PATCH 3/5] Test default limit --- lib/travis/api/v3/services/requests/create.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/travis/api/v3/services/requests/create.rb b/lib/travis/api/v3/services/requests/create.rb index ea3827de..372b299e 100644 --- a/lib/travis/api/v3/services/requests/create.rb +++ b/lib/travis/api/v3/services/requests/create.rb @@ -24,9 +24,9 @@ module Travis::API::V3 def limit(repository) if repository.settings.nil? - Travis.config.requests_create_api_limit || LIMIT + Travis.config.requests_create_api_limit || 50 else - repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit || LIMIT + repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit || 50 end end From 228b594237368d7f4f901f9f44e3dba95ce0db40 Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 5 Apr 2016 17:09:48 +0200 Subject: [PATCH 4/5] Return LIMIT if everything else fails --- lib/travis/api/v3/services/requests/create.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/travis/api/v3/services/requests/create.rb b/lib/travis/api/v3/services/requests/create.rb index 372b299e..ea3827de 100644 --- a/lib/travis/api/v3/services/requests/create.rb +++ b/lib/travis/api/v3/services/requests/create.rb @@ -24,9 +24,9 @@ module Travis::API::V3 def limit(repository) if repository.settings.nil? - Travis.config.requests_create_api_limit || 50 + Travis.config.requests_create_api_limit || LIMIT else - repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit || 50 + repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit || LIMIT end end From 03e992885ea15acd3df358cfc9c10fe94e373468 Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 5 Apr 2016 17:28:00 +0200 Subject: [PATCH 5/5] Bump travis-core --- Gemfile | 2 +- Gemfile.lock | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index fc31b22e..da99c923 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.1.7' if ENV.key?('DYNO') gem 's3', github: 'travis-ci/s3' -gem 'travis-core', github: 'travis-ci/travis-core', branch: 'cd-ar-rate-limit-on-travis-config' +gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-amqp', github: 'travis-ci/travis-amqp' gem 'travis-config', '~> 0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index d425f462..0a19a797 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,8 +48,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 76ddca556f0eb9f40daa50789223db9e18174d46 - branch: cd-ar-rate-limit-on-travis-config + revision: e5740f49f18f826a2d4a246647e5e7f1a26494eb specs: travis-core (0.0.1) actionmailer (~> 3.2.19)