Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
410a2141
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
410a2141
编写于
7月 28, 2016
作者:
R
Rafael França
提交者:
GitHub
7月 28, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #25961 from Azzurrio/master
Fix accessing provider_job_id inside active jobs for sidekiq adapter
上级
303353fc
80e82591
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
1 deletion
+18
-1
activejob/lib/active_job/core.rb
activejob/lib/active_job/core.rb
+1
-0
activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
+1
-1
activejob/test/integration/queuing_test.rb
activejob/test/integration/queuing_test.rb
+9
-0
activejob/test/jobs/provider_jid_job.rb
activejob/test/jobs/provider_jid_job.rb
+7
-0
未找到文件。
activejob/lib/active_job/core.rb
浏览文件 @
410a2141
...
...
@@ -105,6 +105,7 @@ def serialize
# end
def
deserialize
(
job_data
)
self
.
job_id
=
job_data
[
'job_id'
]
self
.
provider_job_id
=
job_data
[
'provider_job_id'
]
self
.
queue_name
=
job_data
[
'queue_name'
]
self
.
priority
=
job_data
[
'priority'
]
self
.
serialized_arguments
=
job_data
[
'arguments'
]
...
...
activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb
浏览文件 @
410a2141
...
...
@@ -37,7 +37,7 @@ class JobWrapper #:nodoc:
include
Sidekiq
::
Worker
def
perform
(
job_data
)
Base
.
execute
job_data
Base
.
execute
job_data
.
merge
(
'provider_job_id'
=>
jid
)
end
end
end
...
...
activejob/test/integration/queuing_test.rb
浏览文件 @
410a2141
require
'helper'
require
'jobs/logging_job'
require
'jobs/hello_job'
require
'jobs/provider_jid_job'
require
'active_support/core_ext/numeric/time'
class
QueuingTest
<
ActiveSupport
::
TestCase
...
...
@@ -34,6 +35,14 @@ class QueuingTest < ActiveSupport::TestCase
end
end
test
'should access provider_job_id inside Sidekiq job'
do
skip
unless
adapter_is?
(
:sidekiq
)
Sidekiq
::
Testing
.
inline!
do
job
=
::
ProviderJidJob
.
perform_later
assert_equal
"Provider Job ID:
#{
job
.
provider_job_id
}
"
,
JobBuffer
.
last_value
end
end
test
'should not run job enqueued in the future'
do
begin
TestJob
.
set
(
wait:
10
.
minutes
).
perform_later
@id
...
...
activejob/test/jobs/provider_jid_job.rb
0 → 100644
浏览文件 @
410a2141
require_relative
'../support/job_buffer'
class
ProviderJidJob
<
ActiveJob
::
Base
def
perform
JobBuffer
.
add
(
"Provider Job ID:
#{
provider_job_id
}
"
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录