refactor

Author: cunla

scheduler/helpers/queues/queue_logic.py

@@ -51,7 +51,8 @@ def perform_job(job_model: JobModel, connection: ConnectionType) -> Any:  # noqa
         if job_model.success_callback:
             job_model.success_callback(job_model, connection, result)
         return result
-    except:
+    except Exception as e:
+        logger.error(f"Job {job_model.name} failed with exception: {e}", exc_info=True)
         if job_model.failure_callback:
             job_model.failure_callback(job_model, connection, *sys.exc_info())
         raise

scheduler/models/task.py

@@ -389,11 +389,7 @@ def clean_queue(self) -> None:
         queue_names = get_queue_names()
         if self.queue not in queue_names:
             raise ValidationError(
-                {
-                    "queue": ValidationError(
-                        "Invalid queue, must be one of: {}".format(", ".join(queue_names)), code="invalid"
-                    )
-                }
+                {"queue": ValidationError(f"Invalid queue, must be one of: {', '.join(queue_names)}", code="invalid")}
             )
 
     def clean_interval_unit(self) -> None:

scheduler/tests/test_job_arg_models.py

@@ -157,7 +157,7 @@ def test__repr__int_val(self):
     def test__repr__datetime_val(self):
         _time = timezone.now()
         kwarg = taskarg_factory(self.TaskArgClass, key="key", arg_type="datetime", val=str(_time))
-        self.assertEqual("('key', {})".format(repr(_time)), repr(kwarg.value()))
+        self.assertEqual(f"('key', {repr(_time)})", repr(kwarg.value()))
 
     def test__repr__bool_val(self):
         kwarg = taskarg_factory(self.TaskArgClass, key="key", arg_type="bool", val="True")

scheduler/tests/test_task_types/test_task_model.py

@@ -245,7 +245,7 @@ def test_callable_args_and_kwargs(self):
             queue = get_queue("default")
             self.assertEqual(
                 perform_job(entry, connection=queue.connection),
-                "test_args_kwargs('one', key1=2, key2={}, key3=False)".format(date),
+                f"test_args_kwargs('one', key1=2, key2={date}, key3=False)",
             )
 
         def test_function_string(self):

scheduler/timeouts.py

@@ -54,11 +54,11 @@ def cancel_death_penalty(self):
 
 class UnixSignalDeathPenalty(BaseDeathPenalty):
     def handle_death_penalty(self, signum, frame) -> None:
-        raise self._exception("Task exceeded maximum timeout value ({0} seconds)".format(self._timeout))
+        raise self._exception(f"Task exceeded maximum timeout value ({self._timeout} seconds)")
 
     def setup_death_penalty(self) -> None:
-        """Sets up an alarm signal and a signal handler that raises an exception after the timeout amount (expressed
-        in seconds)."""
+        """Sets up an alarm signal and a signal handler that raises an exception after the timeout amount
+        (expressed in seconds)."""
         signal.signal(signal.SIGALRM, self.handle_death_penalty)
         signal.alarm(self._timeout)
 
@@ -77,7 +77,7 @@ def __init__(self, timeout, exception=JobTimeoutException, **kwargs):
         # Monkey-patch exception with the message ahead of time
         # since PyThreadState_SetAsyncExc can only take a class
         def init_with_message(self, *args, **kwargs):  # noqa
-            super(exception, self).__init__("Task exceeded maximum timeout value ({0} seconds)".format(timeout))
+            super(exception, self).__init__(f"Task exceeded maximum timeout value ({timeout} seconds)")
 
         self._exception.__init__ = init_with_message