Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2b27a98d
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,发现更多精彩内容 >>
未验证
提交
2b27a98d
编写于
2月 28, 2017
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add support for Workhorse notifications
上级
859a9cd9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
6 deletion
+23
-6
app/models/ci/runner.rb
app/models/ci/runner.rb
+5
-6
changelogs/unreleased/use-redis-channel-to-post-runner-notifcations.yml
...eleased/use-redis-channel-to-post-runner-notifcations.yml
+4
-0
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+14
-0
未找到文件。
app/models/ci/runner.rb
浏览文件 @
2b27a98d
...
...
@@ -127,17 +127,16 @@ module Ci
def
tick_runner_queue
SecureRandom
.
hex
.
tap
do
|
new_update
|
Gitlab
::
Redis
.
with
do
|
redis
|
redis
.
set
(
runner_queue_key
,
new_update
,
ex:
RUNNER_QUEUE_EXPIRY_TIME
)
end
::
Gitlab
::
Workhorse
.
ensure_and_notify
(
runner_queue_key
,
new_update
,
expire:
RUNNER_QUEUE_EXPIRY_TIME
,
overwrite:
true
)
end
end
def
ensure_runner_queue_value
Gitlab
::
Redis
.
with
do
|
redis
|
value
=
SecureRandom
.
hex
redis
.
set
(
runner_queue_key
,
value
,
ex:
RUNNER_QUEUE_EXPIRY_TIME
,
nx:
true
)
redis
.
get
(
runner_queue_key
)
new_
value
=
SecureRandom
.
hex
::
Gitlab
::
Workhorse
.
ensure_and_notify
(
runner_queue_key
,
new_value
,
expire:
RUNNER_QUEUE_EXPIRY_TIME
,
overwrite:
false
)
end
end
...
...
changelogs/unreleased/use-redis-channel-to-post-runner-notifcations.yml
0 → 100644
浏览文件 @
2b27a98d
---
title
:
Use redis channel to post notifications
merge_request
:
author
:
lib/gitlab/workhorse.rb
浏览文件 @
2b27a98d
...
...
@@ -8,6 +8,7 @@ module Gitlab
VERSION_FILE
=
'GITLAB_WORKHORSE_VERSION'
.
freeze
INTERNAL_API_CONTENT_TYPE
=
'application/vnd.gitlab-workhorse+json'
.
freeze
INTERNAL_API_REQUEST_HEADER
=
'Gitlab-Workhorse-Api-Request'
.
freeze
NOTIFICATION_CHANNEL
=
'workhorse:notifications'
.
freeze
# Supposedly the effective key size for HMAC-SHA256 is 256 bits, i.e. 32
# bytes https://tools.ietf.org/html/rfc4868#section-2.6
...
...
@@ -154,6 +155,19 @@ module Gitlab
Rails
.
root
.
join
(
'.gitlab_workhorse_secret'
)
end
def
ensure_and_notify
(
key
,
value
,
expire:
nil
,
overwrite:
true
)
Gitlab
::
Redis
.
with
do
|
redis
|
result
=
redis
.
set
(
key
,
value
,
ex:
expire
,
nx:
!
overwrite
)
if
result
payload
=
"
#{
key
}
=
#{
value
}
"
redis
.
publish
(
RUNNER_NOTIFICATION_CHANNEL
,
payload
)
value
else
redis
.
get
(
key
)
end
end
end
protected
def
encode
(
hash
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录