Commit f6263e2e authored by Kim "BKC" Carlbäcker's avatar Kim "BKC" Carlbäcker

Don't use redis.multi

parent 94b2df02
...@@ -21,7 +21,7 @@ module Ci ...@@ -21,7 +21,7 @@ module Ci
scope :online, ->() { where('contacted_at > ?', LAST_CONTACT_TIME) } scope :online, ->() { where('contacted_at > ?', LAST_CONTACT_TIME) }
scope :ordered, ->() { order(id: :desc) } scope :ordered, ->() { order(id: :desc) }
after_save :tick_update after_save :tick_runner_queue
scope :owned_or_shared, ->(project_id) do scope :owned_or_shared, ->(project_id) do
joins('LEFT JOIN ci_runner_projects ON ci_runner_projects.runner_id = ci_runners.id') joins('LEFT JOIN ci_runner_projects ON ci_runner_projects.runner_id = ci_runners.id')
...@@ -132,14 +132,8 @@ module Ci ...@@ -132,14 +132,8 @@ module Ci
def ensure_runner_queue_value def ensure_runner_queue_value
Gitlab::Redis.with do |redis| Gitlab::Redis.with do |redis|
redis.multi do redis.set(runner_queue_key, value, ex: 60.minutes, nx: true)
value = redis.get(runner_queue_key) redis.get(runner_queue_key)
if value == ""
value = Time.new.inspect
redis.set(runner_queue_key, value, ex: 60.minutes)
end
value
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment