Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
56af2dbe
Commit
56af2dbe
authored
Feb 26, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow bulk_perform_and_wait wait timeout to be overridden
parent
1751cab4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/workers/concerns/waitable_worker.rb
app/workers/concerns/waitable_worker.rb
+2
-2
No files found.
app/workers/concerns/waitable_worker.rb
View file @
56af2dbe
...
@@ -3,7 +3,7 @@ module WaitableWorker
...
@@ -3,7 +3,7 @@ module WaitableWorker
module
ClassMethods
module
ClassMethods
# Schedules multiple jobs and waits for them to be completed.
# Schedules multiple jobs and waits for them to be completed.
def
bulk_perform_and_wait
(
args_list
)
def
bulk_perform_and_wait
(
args_list
,
timeout:
10
)
# Short-circuit: it's more efficient to do small numbers of jobs inline
# Short-circuit: it's more efficient to do small numbers of jobs inline
return
bulk_perform_inline
(
args_list
)
if
args_list
.
size
<=
3
return
bulk_perform_inline
(
args_list
)
if
args_list
.
size
<=
3
...
@@ -14,7 +14,7 @@ module WaitableWorker
...
@@ -14,7 +14,7 @@ module WaitableWorker
waiting_args_list
=
args_list
.
map
{
|
args
|
[
*
args
,
waiter
.
key
]
}
waiting_args_list
=
args_list
.
map
{
|
args
|
[
*
args
,
waiter
.
key
]
}
bulk_perform_async
(
waiting_args_list
)
bulk_perform_async
(
waiting_args_list
)
waiter
.
wait
waiter
.
wait
(
timeout
)
end
end
# Performs multiple jobs directly. Failed jobs will be put into sidekiq so
# Performs multiple jobs directly. Failed jobs will be put into sidekiq so
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment