fixing linting, working on variable log length

Author: samuelcolvin

arq/jobs.py

@@ -8,7 +8,7 @@
 
 import msgpack
 
-from .utils import ellipsis, from_unix_ms, timestamp, to_unix_ms
+from .utils import DEFAULT_CURTAIL, ellipsis, from_unix_ms, timestamp, to_unix_ms
 
 __all__ = ['JobSerialisationError', 'Job', 'DatetimeJob']
 
@@ -68,7 +68,7 @@ def _encode(cls, data) -> bytes:
     def _decode(cls, data: bytes):
         return msgpack.unpackb(data, object_hook=cls.msgpack_object_hook, encoding='utf8')
 
-    def __str__(self):
+    def to_string(self, args_curtail=DEFAULT_CURTAIL):
         arguments = ''
         if self.args:
             arguments = ', '.join(map(str, self.args))
@@ -77,7 +77,10 @@ def __str__(self):
                 arguments += ', '
             arguments += ', '.join('{}={!r}'.format(*kv) for kv in sorted(self.kwargs.items()))
 
-        return '{s.class_name}.{s.func_name}({args})'.format(s=self, args=ellipsis(arguments))
+        return '{s.class_name}.{s.func_name}({args})'.format(s=self, args=ellipsis(arguments, args_curtail))
+
+    def __str__(self):
+        return self.to_string()
 
     def __repr__(self):
         return '<Job {} on {}>'.format(self, self.queue)

arq/utils.py

@@ -149,7 +149,10 @@ def gen_random(length: int=20) -> bytes:
     return base64.urlsafe_b64encode(os.urandom(length))[:length]
 
 
-def ellipsis(s: str, length: int=80) -> str:
+DEFAULT_CURTAIL = 80
+
+
+def ellipsis(s: str, length: int=DEFAULT_CURTAIL) -> str:
     """
     Truncate a string and add an ellipsis (three dots) to the end if it was too long
 

arq/worker.py

@@ -15,8 +15,9 @@
 from multiprocessing import Process
 from signal import Signals  # type: ignore
 
-from .logs import default_log_config
 from .jobs import Job
+from .logs import default_log_config
+from .main import Actor  # noqa
 from .utils import RedisMixin, ellipsis, gen_random, timestamp
 
 __all__ = ['BaseWorker', 'RunWorkerProcess', 'StopJob', 'import_string']
@@ -42,7 +43,7 @@ class BadJob(ArqError):
 
 
 class StopJob(ArqError):
-    def __init__(self, reason: str='-', warning: bool=False):
+    def __init__(self, reason: str='', warning: bool=False) -> None:
         self.warning = warning
         super().__init__(reason)
 
@@ -97,7 +98,7 @@ def __init__(self, *,
 
         self.jobs_complete, self.jobs_failed, self.jobs_timed_out = 0, 0, 0
         self._task_exception = None  # type: Exception
-        self._shadow_lookup = {}  # type: Dict[str, object] # TODO
+        self._shadow_lookup = {}  # type: Dict[str, Actor]
         self.start = None  # type: float
         self.last_health_check = 0
         self.running = True
@@ -363,10 +364,10 @@ def handle_prepare_exc(self, msg: str):
     @classmethod
     def handle_stop_job(cls, started_at: float, exc: StopJob, j: Job):
         if exc.warning:
-            msg, logger = '%-4s ran in%7.3fs . %s: Stopped Warning, %s', jobs_logger.warning
+            msg, logger = '%-4s ran in%7.3fs ■ %s.%s ● Stopped Warning %s', jobs_logger.warning
         else:
-            msg, logger = '%-4s ran in%7.3fs . %s: Stopped, %s', jobs_logger.info
-        logger(msg, j.queue, timestamp() - started_at, j, exc)
+            msg, logger = '%-4s ran in%7.3fs ■ %s.%s ● Stopped %s', jobs_logger.info
+        logger(msg, j.queue, timestamp() - started_at, j.class_name, j.func_name, exc)
 
     @classmethod
     def handle_execute_exc(cls, started_at: float, exc: BaseException, j: Job):

tests/test_worker.py

@@ -41,7 +41,7 @@ async def test_stop_job_normal(mock_actor_worker, caplog):
     actor, worker = mock_actor_worker
     await actor.stop_job_normal()
     await worker.run()
-    assert ('arq.jobs INFO: dft  ran in  0.0XXs . MockRedisDemoActor.stop_job_normal(): Stopped, '
+    assert ('arq.jobs INFO: dft  ran in  0.0XXs ■ MockRedisDemoActor.stop_job_normal ● Stopped '
             'stopping job normally') in caplog(('0.0\d\ds', '0.0XXs'))
 
 
@@ -50,7 +50,7 @@ async def test_stop_job_warning(mock_actor_worker, caplog):
     actor, worker = mock_actor_worker
     await actor.stop_job_warning()
     await worker.run()
-    assert ('arq.jobs WARNING: dft  ran in  0.0XXs . MockRedisDemoActor.stop_job_warning(): Stopped Warning, '
+    assert ('arq.jobs WARNING: dft  ran in  0.0XXs ■ MockRedisDemoActor.stop_job_warning ● Stopped Warning '
             'stopping job with warning') in caplog(('0.0\d\ds', '0.0XXs'))