Skip to content

Run worker with django autoreloader by default #16

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

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

Run worker with django autoreloader by default #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b772f15
Add option to reload using the django autoreloader.
Majsvaffla May 11, 2023
13fcebb
Add logging to indicate worker is listening.
Majsvaffla May 12, 2023
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
32 changes: 29 additions & 3 deletions dpq/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

from django.core.management.base import BaseCommand
from django.db import connection
from django.utils import autoreload
from django.utils.autoreload import raise_last_exception


class Worker(BaseCommand):
Expand All @@ -24,6 +26,12 @@ def add_arguments(self, parser):
action='store_true',
help="Use LISTEN/NOTIFY to wait for events."
)
parser.add_argument(
'--reload',
action='store_true',
dest='use_reloader',
help="Use the auto-reloader.",
)

def handle_shutdown(self, sig, frame):
if self._in_task:
Expand Down Expand Up @@ -67,15 +75,26 @@ def handle(self, **options):
self.delay = options['delay']
self.listen = options['listen']

# Handle the signals for warm shutdown.
signal.signal(signal.SIGINT, self.handle_shutdown)
signal.signal(signal.SIGTERM, self.handle_shutdown)

self.run(**options)

def inner_run(self, **options):
# If an exception was silenced in ManagementUtility.execute in order
# to be raised in the child process, raise it now.
raise_last_exception()

with connection.cursor() as cursor:
cursor.execute("SET application_name TO %s", ['dpq#{}'.format(os.getpid())])

if self.listen:
self.logger.info('Listening for queued tasks', extra={
'channel': self.queue.notify_channel,
})
self.queue.listen()
try:
# Handle the signals for warm shutdown.
signal.signal(signal.SIGINT, self.handle_shutdown)
signal.signal(signal.SIGTERM, self.handle_shutdown)

while True:
self.run_available_tasks()
Expand All @@ -84,6 +103,13 @@ def handle(self, **options):
# got shutdown signal
pass

def run(self, **options):
"""Run the worker, using the autoreloader if needed."""
if options['use_reloader']:
autoreload.run_with_reloader(self.inner_run, **options)
else:
self.inner_run(**options)

def wait(self):
if self.listen:
count = len(self.queue.wait(self.delay))
Expand Down