Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small second pass on logs #159

Merged
merged 1 commit into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions procrastinate/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,13 @@ def _wrap(func: Callable[..., "tasks.Task"]):

def _register(self, task: "tasks.Task") -> None:
self.tasks[task.name] = task
if task.queue not in self.queues:
queue = task.queue
if queue not in self.queues:
logger.debug(
f"Registering queue {task.queue}",
extra={"action": "register_queue", "queue": task.queue},
f"Registering queue {queue}",
extra={"action": "register_queue", "queue": queue},
)
self.queues.add(task.queue)
self.queues.add(queue)

def _register_builtin_tasks(self) -> None:
builtin_tasks.register_builtin_tasks(self)
Expand Down
5 changes: 3 additions & 2 deletions procrastinate/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ def click_set_verbosity(ctx: click.Context, param: click.Parameter, value: int)
def set_verbosity(verbosity: int) -> None:
level = get_log_level(verbosity=verbosity)
logging.basicConfig(level=level)
level_name = logging.getLevelName(level)
logger.info(
f"Log level set to {logging.getLevelName(level)}",
extra={"action": "set_log_level", "value": logging.getLevelName(level)},
f"Log level set to {level_name}",
extra={"action": "set_log_level", "value": level_name},
)


Expand Down
33 changes: 17 additions & 16 deletions procrastinate/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,17 @@ def __init__(
self.logger = logger

async def run(self) -> None:
await self.job_store.listen_for_jobs(queues=self.queues)
queues = self.queues
await self.job_store.listen_for_jobs(queues=queues)

self.logger.debug(
f"Log start one queues {self.queues}",
extra={"action": "start_log_on_queue", "queues": str(self.queues)},
if queues:
queue_names = f"queues {', '.join(queues)}"
else:
queue_names = "all queues"

self.logger.info(
f"Starting worker on queues {queue_names}",
extra={"action": "start_worker", "queues": queues},
elemoine marked this conversation as resolved.
Show resolved Hide resolved
)
with signals.on_stop(self.stop):
while not self.stop_requested:
Expand All @@ -49,18 +55,15 @@ async def run(self) -> None:
break
except exceptions.NoMoreJobs:
self.logger.debug(
f"Waiting for new jobs on queues {self.queues}",
extra={
"action": "waiting_for_jobs",
"queues": str(self.queues),
},
f"Waiting for new jobs on queues {queue_names}",
extra={"action": "waiting_for_jobs", "queues": queues},
)

await self.job_store.wait_for_jobs()

self.logger.debug(
f"Stopped worker on {self.queues}",
extra={"action": "stopped_worker", "queues": str(self.queues)},
self.logger.info(
f"Stopped worker on {queue_names}",
extra={"action": "stop_worker", "queues": queues},
)

async def process_jobs_once(self) -> NoReturn:
Expand Down Expand Up @@ -111,9 +114,7 @@ async def process_next_job(self) -> None:

def load_task(self, task_name) -> tasks.Task:
if task_name in self.known_missing_tasks:
raise exceptions.TaskNotFound(
f"Cannot run job for task {task_name} previsouly not found"
)
raise exceptions.TaskNotFound(f"Cancelling job for {task_name} (not found)")

try:
# Simple case: the task is already known
Expand Down Expand Up @@ -188,7 +189,7 @@ async def run_job(self, job: jobs.Job) -> None:
extra = {"action": log_action, **log_context, "result": task_result}
ftext = (
f"{log_title} - Job {job_context['call_string']} "
f"in {job_context['duration_seconds']:.3f}"
f"in {job_context['duration_seconds']:.3f} s"
)
self.logger.log(log_level, ftext, extra=extra, exc_info=exc_info)

Expand Down