diff options
| author | lowercase00 <21188280+lowercase00@users.noreply.github.com> | 2023-02-04 23:32:41 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-05 09:32:41 +0700 |
| commit | 27cbf48ad4c430fee8ac1422b2f8e3e605e11b31 (patch) | |
| tree | 98a71f4c4b5325076d5fdba31057c7b12db4358c /rq | |
| parent | fdb14df18141b6bedc40d719904f56e64984bc37 (diff) | |
| download | rq-27cbf48ad4c430fee8ac1422b2f8e3e605e11b31.tar.gz | |
Debug mode log fixes (#1798)
Current worker on debug mode doesn't raises errors,
but does have some formatting issues.
Diffstat (limited to 'rq')
| -rw-r--r-- | rq/queue.py | 3 | ||||
| -rw-r--r-- | rq/worker.py | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/rq/queue.py b/rq/queue.py index bc7f070..1d98492 100644 --- a/rq/queue.py +++ b/rq/queue.py @@ -1155,14 +1155,13 @@ class Queue: if timeout is not None: # blocking variant if timeout == 0: raise ValueError('RQ does not support indefinite timeouts. Please pick a timeout value > 0') - colored_queues = [green(queue) for queue in queue_keys] + colored_queues = ''.join(map(str, [green(str(queue)) for queue in queue_keys])) logger.debug(f"Starting BLPOP operation for queues {colored_queues} with timeout of {timeout}") result = connection.blpop(queue_keys, timeout) if result is None: logger.debug(f"BLPOP Timeout, no jobs found on queues {colored_queues}") raise DequeueTimeout(timeout, queue_keys) queue_key, job_id = result - logger.debug(f"Dequeued job {blue(job_id.decode('utf-8'))} from queue {green(queue_key.decode('utf-8'))}") return queue_key, job_id else: # non-blocking variant for queue_key in queue_keys: diff --git a/rq/worker.py b/rq/worker.py index 06a707e..87f3e26 100644 --- a/rq/worker.py +++ b/rq/worker.py @@ -752,7 +752,7 @@ class Worker: if self.should_run_maintenance_tasks: self.run_maintenance_tasks() - self.log.debug(f"Dequeueing jobs on queues {self._ordered_queues} and timeout {timeout}") + self.log.debug(f"Dequeueing jobs on queues {green(qnames)} and timeout {timeout}") result = self.queue_class.dequeue_any( self._ordered_queues, timeout, @@ -760,9 +760,8 @@ class Worker: job_class=self.job_class, serializer=self.serializer, ) - self.log.debug(f"Dequeued job {result[1]} from {result[0]}") if result is not None: - + self.log.debug(f"Dequeued job {blue(result[0].id)} from {green(result[1].name)}") job, queue = result job.redis_server_version = self.get_redis_server_version() if self.log_job_description: |