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
b0b05f81
Commit
b0b05f81
authored
Dec 16, 2016
by
Kim "BKC" Carlbäcker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make expire-time a constant, correct function in Service
parent
fb713071
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
runner.rb
app/models/ci/runner.rb
+3
-2
update_build_queue_service.rb
app/services/ci/update_build_queue_service.rb
+1
-1
No files found.
app/models/ci/runner.rb
View file @
b0b05f81
...
...
@@ -2,6 +2,7 @@ module Ci
class
Runner
<
ActiveRecord
::
Base
extend
Ci
::
Model
LAST_UPDATE_EXPIRE_TIME
=
60
.
minutes
LAST_CONTACT_TIME
=
1
.
hour
.
ago
AVAILABLE_SCOPES
=
%w[specific shared active paused online]
FORM_EDITABLE
=
%i[description tag_list active run_untagged locked]
...
...
@@ -126,14 +127,14 @@ module Ci
def
tick_runner_queue
new_update
=
Time
.
new
.
inspect
Gitlab
::
Redis
.
with
{
|
redis
|
redis
.
set
(
runner_queue_key
,
new_update
,
ex:
60
.
minutes
)
}
Gitlab
::
Redis
.
with
{
|
redis
|
redis
.
set
(
runner_queue_key
,
new_update
,
ex:
LAST_UPDATE_EXPIRE_TIME
)
}
new_update
end
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
.
set
(
runner_queue_key
,
value
,
ex:
LAST_UPDATE_EXPIRE_TIME
,
nx:
true
)
redis
.
get
(
runner_queue_key
)
end
end
...
...
app/services/ci/update_build_queue_service.rb
View file @
b0b05f81
...
...
@@ -3,7 +3,7 @@ module Ci
def
execute
(
build
)
build
.
project
.
runners
.
select
do
|
runner
|
if
runner
.
can_pick?
(
build
)
runner
.
tick_
updat
e
runner
.
tick_
runner_queu
e
end
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