Fixes #5479 - Allow setting individual timeouts on scripts and reports #9028
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
Fixed build failing because of pep8 check (I should get those git hooks working). Just squash before merging. |
DanSheps
reviewed
Apr 8, 2022
|
|
||
| func.delay(*args, job_id=str(job_result.job_id), job_result=job_result, **kwargs) | ||
| queue = django_rq.get_queue("default") | ||
| queue.enqueue(func, job_id=str(job_result.job_id), job_result=job_result, **kwargs) |
Member
There was a problem hiding this comment.
I don't know enough about django_rq to know if there is a reason to use the job decorator over just enqueuing the job.
I do like that doing this also gives us the ability to schedule jobs down the line.
Member
There was a problem hiding this comment.
Should have the same net effect either way.
jeremystretch
approved these changes
Apr 8, 2022
Member
jeremystretch
left a comment
jeremystretch
left a comment
There was a problem hiding this comment.
Excellent work, thank you!
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #5479
Allows setting the job_timeout Meta attribute on scripts and the job_timeout attribute on reports. I tested UI, API and CLI execution. Scripts ran through the CLI do not support the timeout, as those are not ran through the rqworker for some reason.
I had to change enqueue_job slightly as I found no way to pass the timeout via. the
delaymethod added by the@jobdecorator.