Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
29fcbc2e
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,发现更多精彩内容 >>
提交
29fcbc2e
编写于
5月 07, 2015
作者:
J
Jeroen van Baarsen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make que report back its job_id to provider_job_id
Signed-off-by:
N
Jeroen van Baarsen
<
jeroenvanbaarsen@gmail.com
>
上级
52d13182
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
20 deletion
+13
-20
activejob/CHANGELOG.md
activejob/CHANGELOG.md
+3
-8
activejob/lib/active_job/queue_adapters/que_adapter.rb
activejob/lib/active_job/queue_adapters/que_adapter.rb
+6
-2
activejob/test/integration/queuing_test.rb
activejob/test/integration/queuing_test.rb
+4
-10
未找到文件。
activejob/CHANGELOG.md
浏览文件 @
29fcbc2e
*
Allow
`Sidekiq`
to report the job id back to
`ActiveJob::Base`
as
`provider_job_id`
*Jeroen van Baarsen*
*
Allow
`DelayedJob`
to report id back to
`ActiveJob::Base`
as
`provider_job_id`
.
*
Allow
`DelayedJob`
,
`Sidekiq`
and
`que`
to report the job id back to
`ActiveJob::Base`
as
`provider_job_id`
.
Fixes #18821.
*Kevin Deisz*
*Kevin Deisz*
And *Jeroen van Baarsen*
*
`assert_enqueued_jobs`
and
`assert_performed_jobs`
in block form use the
given number as expected value. This makes the error message much easier to
...
...
activejob/lib/active_job/queue_adapters/que_adapter.rb
浏览文件 @
29fcbc2e
...
...
@@ -16,11 +16,15 @@ module QueueAdapters
# Rails.application.config.active_job.queue_adapter = :que
class
QueAdapter
def
enqueue
(
job
)
#:nodoc:
JobWrapper
.
enqueue
job
.
serialize
que_job
=
JobWrapper
.
enqueue
job
.
serialize
job
.
provider_job_id
=
que_job
.
attrs
[
"job_id"
]
que_job
end
def
enqueue_at
(
job
,
timestamp
)
#:nodoc:
JobWrapper
.
enqueue
job
.
serialize
,
run_at:
Time
.
at
(
timestamp
)
que_job
=
JobWrapper
.
enqueue
job
.
serialize
,
run_at:
Time
.
at
(
timestamp
)
job
.
provider_job_id
=
que_job
.
attrs
[
"job_id"
]
que_job
end
class
JobWrapper
<
Que
::
Job
#:nodoc:
...
...
activejob/test/integration/queuing_test.rb
浏览文件 @
29fcbc2e
...
...
@@ -56,19 +56,13 @@ class QueuingTest < ActiveSupport::TestCase
end
end
test
'should supply a provider_job_id
to DelayedJob
'
do
skip
unless
adapter_is?
(
:delayed_job
)
test
'should supply a provider_job_id
when available
'
do
skip
unless
adapter_is?
(
:
sidekiq
)
||
adapter_is?
(
:que
)
||
adapter_is?
(
:
delayed_job
)
test_job
=
TestJob
.
perform_later
@id
assert_kind_of
Fixnum
,
test_job
.
provider_job_id
end
test
'should supply a provider_job_id to Sidekiq'
do
skip
unless
adapter_is?
(
:sidekiq
)
test_job
=
TestJob
.
perform_later
@id
refute
test_job
.
provider_job_id
.
nil?
,
"Provider job id should be set by Sidekiq"
refute
test_job
.
provider_job_id
.
nil?
,
"Provider job id should be set by provider"
delayed_test_job
=
TestJob
.
set
(
wait:
1
.
minute
).
perform_later
@id
refute
delayed_test_job
.
provider_job_id
.
nil?
,
"Provider job id should by set for delayed jobs by
sidekiq
"
"Provider job id should by set for delayed jobs by
provider
"
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录