From 38b959ebd14bed72bef7f3eb2f7d68147dd89048 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 22 May 2022 11:38:17 +0200 Subject: [PATCH 1/2] fix --- rowers/uploads.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/uploads.py b/rowers/uploads.py index 797aadaf..13e332db 100644 --- a/rowers/uploads.py +++ b/rowers/uploads.py @@ -87,7 +87,7 @@ def make_plot(r, w, f1, f2, plottype, title, imagename='', plotnr=0): } axis = r.staticgrids - if axis is None: # pragma: no cover + if axis is None or axis.lower() == 'none': # pragma: no cover gridtrue = False axis = 'both' else: From adf1002809d146d4125b3fe87d908c8a2344cca1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 22 May 2022 11:50:19 +0200 Subject: [PATCH 2/2] redis rq delete job and failed queue update --- rowers/views/otherviews.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/rowers/views/otherviews.py b/rowers/views/otherviews.py index 19774acb..b783496d 100644 --- a/rowers/views/otherviews.py +++ b/rowers/views/otherviews.py @@ -38,11 +38,14 @@ def failed_queue_view(request): if not request.user.is_staff: # pragma: no cover raise PermissionDenied("Not Allowed") - q = Queue('failed', connection=Redis()) + q = Queue(connection=Redis()) + registry = q.failed_job_registry + resultslist = [] - for job in q.jobs: # pragma: no cover + for id in registry.get_job_ids(): # pragma: no cover + job = Job.fetch(id,connection=Redis()) traceback = str(job.exc_info) info = { @@ -66,9 +69,11 @@ def failed_queue_empty(request): if not request.user.is_staff: # pragma: no cover raise PermissionDenied("Not Allowed") - q = Queue('failed', connection=Redis()) + q = Queue(connection=Redis()) + registry = q.failed_job_registry - q.empty() + for id in registry.get_job_ids(): + registry.remove(id,delete_job=True) return HttpResponseRedirect(reverse('failed_queue_view'))