diff --git a/rowers/tasks.py b/rowers/tasks.py index a037a37d..c2d88579 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1178,7 +1178,7 @@ def handle_check_race_course(self, return 1 else: # pragma: no cover - record = VirtualRaceResult.object.get(id=recordid) + record = VirtualRaceResult.objects.get(id=recordid) record.duration = totaltime_sec_to_string(0) record.distance = 0 record.workoutid = workoutid @@ -2648,7 +2648,7 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename, df = df.select_types(['number']) df = row.df.groupby(lambda x: x / bin).mean() row.df = df - except TypeError: + except: pass nr_rows = len(row.df) if (plotnr == 1): diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index a6ad89e0..431b7721 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/otherviews.py b/rowers/views/otherviews.py index bf567847..fb6d5f0a 100644 --- a/rowers/views/otherviews.py +++ b/rowers/views/otherviews.py @@ -104,10 +104,16 @@ def failed_job_view(request, id=0): # pragma: no cover if not request.user.is_staff: raise PermissionDenied("Not Allowed") - q = Queue('failed', connection=Redis()) - thejob = q.fetch_job(id) - - thejob.delete() + for queuename in ['high','default','low']: + q = Queue(queuename, connection=Redis()) + reqistry = q.failed_job_registry + for tid in registry.get_job_ids(): + if tid == id: + try: + job = Job.fetch(id, connection=Redis()) + registry.remove(id, delete_job=True) + except: + pass return HttpResponseRedirect(reverse('failed_queue_view'))