summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2016-12-16 16:32:16 +0100
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2016-12-16 16:32:16 +0100
commit24f0a45b0f8558071987ec1d70446f8e9f7df0ec (patch)
tree4c6a58f969dd4eb5a99bea274f012b95f624973a
parentf6263e2ee7288ff1b53b551053911f31ddf846b7 (diff)
downloadgitlab-ce-24f0a45b0f8558071987ec1d70446f8e9f7df0ec.tar.gz
Do things in the correct order
-rw-r--r--app/models/ci/runner.rb1
-rw-r--r--lib/ci/api/builds.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index e880ea9a880..221da8adf32 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -132,6 +132,7 @@ module Ci
def ensure_runner_queue_value
Gitlab::Redis.with do |redis|
+ value = Time.new.inspect
redis.set(runner_queue_key, value, ex: 60.minutes, nx: true)
redis.get(runner_queue_key)
end
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index b1b66313092..8264210c460 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -21,6 +21,8 @@ module Ci
return build_not_found!
end
+ new_update = current_runner.ensure_runner_queue_value
+
build = Ci::RegisterBuildService.new.execute(current_runner)
if build
@@ -31,7 +33,6 @@ module Ci
else
Gitlab::Metrics.add_event(:build_not_found)
- new_update = current_runner.ensure_runner_queue_value
headers 'X-GitLab-Last-Update', new_update
build_not_found!