Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatibility with RQ 2.0 #675

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Compatibility with RQ 2.0 #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ffa550b
rqworker command can now run
selwin Sep 16, 2024
b90d42a
Merge branch 'master' of github.com:rq/django-rq into rq-v2
selwin Sep 30, 2024
b02a724
Make job_detail.html display better
selwin Oct 1, 2024
7df99c2
Properly show currently running executions
selwin Oct 1, 2024
0981474
Minor job detail cleanup
selwin Oct 3, 2024
78efadd
Merge branch 'master' into rq-v2
selwin Oct 6, 2024
555b013
Fixed a few tests
selwin Oct 6, 2024
3232841
Made stop job command work again
selwin Oct 6, 2024
baad70c
Fixed tests
selwin Oct 6, 2024
40f109f
Failed job registry should show jobs in reverse chronological order.
selwin Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions django_rq/management/commands/rqworker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import sys

from redis.exceptions import ConnectionError
from rq import Connection
from rq.logutils import setup_loghandlers

from django.core.management.base import BaseCommand
Expand Down Expand Up @@ -84,21 +83,18 @@ def handle(self, *args, **options):
'queue_class': options['queue_class'],
'job_class': options['job_class'],
'name': options['name'],
'default_worker_ttl': options['worker_ttl'],
'worker_ttl': options['worker_ttl'],
'serializer': options['serializer']
}
w = get_worker(*args, **worker_kwargs)

# Call Connection context manager to push the redis connection into LocalStack
# without this, jobs using RQ's get_current_job() will fail
with Connection(w.connection):
# Close any opened DB connection before any fork
reset_db_connections()
# Close any opened DB connection before any fork
reset_db_connections()

w.work(
burst=options.get('burst', False), with_scheduler=options.get('with_scheduler', False),
logging_level=level, max_jobs=options['max_jobs']
)
w.work(
burst=options.get('burst', False), with_scheduler=options.get('with_scheduler', False),
logging_level=level, max_jobs=options['max_jobs']
)
except ConnectionError as e:
self.stderr.write(str(e))
sys.exit(1)
145 changes: 91 additions & 54 deletions django_rq/templates/django_rq/job_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,116 +37,141 @@

<div class="form-row">
<div>
<label>Queue:</label>
<div class="readonly">{{ job.origin }}</div>
<div class = "flex-container">
<label>Queue:</label>
<div class="readonly">{{ job.origin }}</div>
</div>
</div>
</div>

<div class="form-row">
<div>
<label>Timeout:</label>
<div class="readonly">{{ job.timeout }}</div>
<div class = "flex-container">
<label>Timeout:</label>
<div class="readonly">{{ job.timeout }}</div>
</div>
</div>
</div>

<div class="form-row">
<div>
<label>Result TTL:</label>
<div class="readonly">{{ job.result_ttl }}</div>
<div class = "flex-container">
<label>Result TTL:</label>
<div class="readonly">{{ job.result_ttl }}</div>
</div>
</div>
</div>

{% if job.created_at %}
<div class="form-row">
<div>
<label>Created:</label>
<div class="readonly">{{ job.created_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
<div class = "flex-container">
<label>Created:</label>
<div class="readonly">{{ job.created_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
</div>
</div>
</div>
{% endif %}

{% if job.enqueued_at %}
<div class="form-row">
<div>
<label>Queued:</label>
<div class="readonly">{{ job.enqueued_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
<div class = "flex-container">
<label>Queued:</label>
<div class="readonly">{{ job.enqueued_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
</div>
</div>
</div>
{% endif %}

{% if job.started_at %}
<div class="form-row">
<div>
<label>Started:</label>
<div class="readonly">{{ job.started_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
<div class = "flex-container">
<label>Started:</label>
<div class="readonly">{{ job.started_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
</div>
</div>
</div>
{% endif %}

{% if job.ended_at %}
<div class="form-row">
<div>
<label>Ended:</label>
<div class="readonly">{{ job.ended_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
<div class = "flex-container">
<label>Ended:</label>
<div class="readonly">{{ job.ended_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
</div>
</div>
</div>
{% endif %}

<div class="form-row">
<div>
<label>Status:</label>
<div class="readonly">{{ job.get_status }}</div>
<div class = "flex-container">
<label>Status:</label>
<div class="readonly">{{ job.get_status }}</div>
</div>
</div>
</div>

<div class="form-row">
<div>
<label>Callable:</label>
<div class="readonly">{{ job|show_func_name }}</div>
<div class = "flex-container">
<label>Callable:</label>
<div class="readonly">{{ job|show_func_name }}</div>
</div>
</div>
</div>

<div class="form-row">
<div>
<label>Meta:</label>
<div class="data">{{ job.meta }}</div>
<div class = "flex-container">
<label>Meta:</label>
<div class="data">{{ job.meta }}</div>
</div>
</div>
</div>

<div class="form-row">
<div>
<label>Args:</label>
<div>
{% if data_is_valid %}
{% if job.args %}
<ul>
{% for arg in job.args %}
<li>{{ arg|force_escape }}</li>
{% endfor %}
</ul>
<div class = "flex-container">
<label>Args:</label>
<div>

{% if data_is_valid %}
{% if job.args %}
<ul>
{% for arg in job.args %}
<li>{{ arg|force_escape }}</li>
{% endfor %}
</ul>
{% endif %}
{% else %}
Unpickling Error
{% endif %}
{% else %}
Unpickling Error
{% endif %}
</div>
</div>
</div>
</div>

<div class="form-row">
<div>
<label>Kwargs:</label>
<div>
{% if data_is_valid %}
{% if job.kwargs %}
<ul>
{% for key, value in job.kwargs|items %}
<li>{{ key }}: {{ value|force_escape }}</li>
{% endfor %}
</ul>
<div class = "flex-container">
<label>Kwargs:</label>
<div>
{% if data_is_valid %}
{% if job.kwargs %}
<ul>
{% for key, value in job.kwargs|items %}
<li>{{ key }}: {{ value|force_escape }}</li>
{% endfor %}
</ul>
{% endif %}
{% else %}
Unpickling Error
{% endif %}
{% else %}
Unpickling Error
{% endif %}
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -175,8 +200,10 @@
{% if job.legacy_result %}
<div class="form-row">
<div>
<label>Result:</label>
<div>{{ job.result }}</div>
<div class = "flex-container">
<label>Result:</label>
<div class="readonly">{{ job.result }}</div>
</div>
</div>
</div>
{% endif %}
Expand Down Expand Up @@ -216,29 +243,39 @@ <h2>Result {{ result.id }}</h2>
<fieldset class="module aligned ">
<div class="form-row field-choice_text">
<div>
<label>Type:</label>
<div class="readonly">{{ result.type.name }}</div>
<div class = "flex-container">
<label>Type:</label>
<div class="readonly">
{{ result.type.name }}
</div>
</div>
</div>
</div>

<div class="form-row field-votes">
<div>
<label>Created at:</label>
<div class="readonly">{{ result.created_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
<div class = "flex-container">
<label>Created at:</label>
<div class="readonly">{{ result.created_at|to_localtime|date:"Y-m-d, H:i:s" }}</div>
</div>
</div>
</div>
{% if result.type.value == 1 %}
<div class="form-row field-votes">
<div>
<label>Return value:</label>
<div><pre>{{ result.return_value }}</pre></div>
<div class = "flex-container">
<label>Return value:</label>
<div><pre>{{ result.return_value }}</pre></div>
</div>
</div>
</div>
{% elif result.type.value == 2 %}
<div class="form-row field-votes">
<div>
<label>Exception:</label>
<div><pre>{{ result.exc_string }}</pre></div>
<div class = "flex-container">
<label>Exception:</label>
<div><pre>{{ result.exc_string }}</pre></div>
</div>
</div>
</div>
{% endif %}
Expand Down
Loading
Loading