Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
264bf229
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,发现更多精彩内容 >>
提交
264bf229
编写于
5月 03, 2017
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add propagate service worker and updated spec and controller
上级
e81ea165
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
73 addition
and
7 deletion
+73
-7
app/controllers/admin/services_controller.rb
app/controllers/admin/services_controller.rb
+1
-1
app/models/service.rb
app/models/service.rb
+10
-0
app/workers/propagate_project_service_worker.rb
app/workers/propagate_project_service_worker.rb
+49
-0
spec/workers/propagate_project_service_worker_spec.rb
spec/workers/propagate_project_service_worker_spec.rb
+13
-6
未找到文件。
app/controllers/admin/services_controller.rb
浏览文件 @
264bf229
...
...
@@ -15,7 +15,7 @@ class Admin::ServicesController < Admin::ApplicationController
end
def
update
if
service
.
update_a
ttributes
(
service_params
[
:service
])
if
service
.
update_a
nd_propagate
(
service_params
[
:service
])
redirect_to
admin_application_settings_services_path
,
notice:
'Application settings saved successfully'
else
...
...
app/models/service.rb
浏览文件 @
264bf229
...
...
@@ -254,6 +254,16 @@ class Service < ActiveRecord::Base
service
end
def
update_and_propagate
(
service_params
)
return
false
unless
update_attributes
(
service_params
)
if
service_params
[
:active
]
==
1
PropagateProjectServiceWorker
.
perform_async
(
service_params
[
:id
])
end
true
end
private
def
cache_project_has_external_issue_tracker
...
...
app/workers/propagate_project_service_worker.rb
0 → 100644
浏览文件 @
264bf229
# Worker for updating any project specific caches.
class
PropagateProjectServiceWorker
include
Sidekiq
::
Worker
include
DedicatedSidekiqQueue
LEASE_TIMEOUT
=
30
.
minutes
.
to_i
def
perform
(
template_id
)
template
=
Service
.
find_by
(
id:
template_id
)
return
unless
template
&
.
active
return
unless
try_obtain_lease_for
(
template
.
id
)
Rails
.
logger
.
info
(
"Propagating services for template
#{
template
.
id
}
"
)
project_ids_for_template
(
template
)
do
|
project_id
|
Service
.
build_from_template
(
project_id
,
template
).
save!
end
end
private
def
project_ids_for_template
(
template
)
limit
=
100
offset
=
0
loop
do
batch
=
project_ids_batch
(
limit
,
offset
,
template
.
type
)
batch
.
each
{
|
project_id
|
yield
(
project_id
)
}
break
if
batch
.
count
<
limit
offset
+=
limit
end
end
def
project_ids_batch
(
limit
,
offset
,
template_type
)
Project
.
joins
(
'LEFT JOIN services ON services.project_id = projects.id'
).
where
(
'services.type != ? OR services.id IS NULL'
,
template_type
).
limit
(
limit
).
offset
(
offset
).
pluck
(
:id
)
end
def
try_obtain_lease_for
(
template_id
)
Gitlab
::
ExclusiveLease
.
new
(
"propagate_project_service_worker:
#{
template_id
}
"
,
timeout:
LEASE_TIMEOUT
).
try_obtain
end
end
spec/workers/propagate_project_service_worker_spec.rb
浏览文件 @
264bf229
require
'spec_helper'
describe
Pr
uneOldEvents
Worker
do
describe
Pr
opagateProjectService
Worker
do
describe
'#perform'
do
let!
(
:service_template
)
do
PushoverService
.
create
(
template:
true
,
active:
true
,
properties:
{
device:
'MyDevice'
,
sound:
'mic'
,
priority:
4
,
user_key:
'asdf'
,
api_key:
'123456789'
})
end
let!
(
:project
)
{
create
(
:empty_project
)
}
before
do
allow_any_instance_of
(
Gitlab
::
ExclusiveLease
).
to
receive
(
:try_obtain
).
and_return
(
true
)
end
it
'creates services for projects'
do
expect
{
subject
.
perform
}.
to
change
{
Service
.
count
}.
by
(
1
)
expect
{
subject
.
perform
(
service_template
.
id
)
}.
to
change
{
Service
.
count
}.
by
(
1
)
end
it
'does not create the service if it exists already'
do
Service
.
build_from_template
(
project
.
id
,
service_template
).
save!
expect
{
subject
.
perform
}.
not_to
change
{
Service
.
count
}
expect
{
subject
.
perform
(
service_template
.
id
)
}.
not_to
change
{
Service
.
count
}
end
it
'creates the service containing the template attributes'
do
subject
.
perform
subject
.
perform
(
service_template
.
id
)
service
=
Service
.
find_by
(
service_template
.
merge
(
project_id:
project
.
id
,
template:
false
)
)
service
=
Service
.
find_by
(
type:
service_template
.
type
,
template:
false
)
expect
(
service
).
not_to
be_nil
expect
(
service
.
properties
).
to
eq
(
service_template
.
properties
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录