summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-06-08 12:27:35 +0000
committerTomasz Maczukin <tomasz@maczukin.pl>2016-06-14 22:20:15 +0200
commitb6f28a177ede2fcd0ab746efee770a2c7a6f62ae (patch)
tree231c923c7e7cd6d6bbadfed344bcc2f9a50c5d21
parent520a57a10537ba174f69faf763478a8e5a4603a6 (diff)
downloadgitlab-ce-b6f28a177ede2fcd0ab746efee770a2c7a6f62ae.tar.gz
Merge branch 'gh-disable-webhooks' into 'master'
Check if GitHub rate limite API was reached before update Webhooks ## What does this MR do? Checks if the job needs to sleep, and wait for the rate limit to be reseted before update each Webhook. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The import process can fail if the API rate limit was reached during the import process. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17498 ## Screenshots (if relevant) Not relevant. See merge request !4509
-rw-r--r--lib/gitlab/github_import/importer.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 442b4c389fe..5ef9d66ba68 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -146,6 +146,7 @@ module Gitlab
def update_webhooks(hooks, options)
hooks.each do |hook|
+ sleep rate_limit_sleep_time if rate_limit_exceed?
client.edit_hook(repo, hook.id, hook.name, hook.config, options)
end
end