Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6a29ac7d
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
6a29ac7d
编写于
8月 31, 2016
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change update interval of runners when trying to preserve contacted_at
上级
1d548869
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
5 deletion
+8
-5
CHANGELOG
CHANGELOG
+1
-0
app/models/ci/runner.rb
app/models/ci/runner.rb
+1
-1
lib/ci/api/builds.rb
lib/ci/api/builds.rb
+1
-1
lib/ci/api/helpers.rb
lib/ci/api/helpers.rb
+5
-3
未找到文件。
CHANGELOG
浏览文件 @
6a29ac7d
...
...
@@ -63,6 +63,7 @@ v 8.12.0 (unreleased)
- Fix badge count alignment (ClemMakesApps)
- Remove green outline from `New branch unavailable` button on issue page !5858 (winniehell)
- Fix repo title alignment (ClemMakesApps)
- Change update interval of contacted_at
- Fix branch title trailing space on hover (ClemMakesApps)
- Award emoji tooltips containing more than 10 usernames are now truncated !4780 (jlogandavison)
- Fix duplicate "me" in award emoji tooltip !5218 (jlogandavison)
...
...
app/models/ci/runner.rb
浏览文件 @
6a29ac7d
...
...
@@ -2,7 +2,7 @@ module Ci
class
Runner
<
ActiveRecord
::
Base
extend
Ci
::
Model
LAST_CONTACT_TIME
=
5
.
minute
s
.
ago
LAST_CONTACT_TIME
=
2
.
hour
s
.
ago
AVAILABLE_SCOPES
=
%w[specific shared active paused online]
FORM_EDITABLE
=
%i[description tag_list active run_untagged locked]
...
...
lib/ci/api/builds.rb
浏览文件 @
6a29ac7d
...
...
@@ -12,7 +12,7 @@ module Ci
# POST /builds/register
post
"register"
do
authenticate_runner!
update_runner_last_contact
update_runner_last_contact
(
save:
false
)
update_runner_info
required_attributes!
[
:token
]
not_found!
unless
current_runner
.
active?
...
...
lib/ci/api/helpers.rb
浏览文件 @
6a29ac7d
...
...
@@ -3,7 +3,7 @@ module Ci
module
Helpers
BUILD_TOKEN_HEADER
=
"HTTP_BUILD_TOKEN"
BUILD_TOKEN_PARAM
=
:token
UPDATE_RUNNER_EVERY
=
60
UPDATE_RUNNER_EVERY
=
40
*
60
def
authenticate_runners!
forbidden!
unless
runner_registration_token_valid?
...
...
@@ -22,11 +22,13 @@ module Ci
params
[
:token
]
==
current_application_settings
.
runners_registration_token
end
def
update_runner_last_contact
def
update_runner_last_contact
(
save:
true
)
# Use a random threshold to prevent beating DB updates
# it generates a distribution between: [40m, 80m]
contacted_at_max_age
=
UPDATE_RUNNER_EVERY
+
Random
.
rand
(
UPDATE_RUNNER_EVERY
)
if
current_runner
.
contacted_at
.
nil?
||
Time
.
now
-
current_runner
.
contacted_at
>=
contacted_at_max_age
current_runner
.
update_attributes
(
contacted_at:
Time
.
now
)
current_runner
.
contacted_at
=
Time
.
now
current_runner
.
save
if
current_runner
.
changed?
&&
save
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录