BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f6263e2e
Commit
f6263e2e
authored
Dec 16, 2016
by
Kim "BKC" Carlbäcker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use redis.multi
parent
94b2df02
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
runner.rb
app/models/ci/runner.rb
+3
-9
No files found.
app/models/ci/runner.rb
View file @
f6263e2e
...
...
@@ -21,7 +21,7 @@ module Ci
scope
:online
,
->
()
{
where
(
'contacted_at > ?'
,
LAST_CONTACT_TIME
)
}
scope
:ordered
,
->
()
{
order
(
id: :desc
)
}
after_save
:tick_
updat
e
after_save
:tick_
runner_queu
e
scope
:owned_or_shared
,
->
(
project_id
)
do
joins
(
'LEFT JOIN ci_runner_projects ON ci_runner_projects.runner_id = ci_runners.id'
)
...
...
@@ -132,14 +132,8 @@ module Ci
def
ensure_runner_queue_value
Gitlab
::
Redis
.
with
do
|
redis
|
redis
.
multi
do
value
=
redis
.
get
(
runner_queue_key
)
if
value
==
""
value
=
Time
.
new
.
inspect
redis
.
set
(
runner_queue_key
,
value
,
ex:
60
.
minutes
)
end
value
end
redis
.
set
(
runner_queue_key
,
value
,
ex:
60
.
minutes
,
nx:
true
)
redis
.
get
(
runner_queue_key
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment