Skip to content
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
10 changes: 8 additions & 2 deletions democrasite/webiscite/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,14 @@ class Meta:
def __str__(self) -> str:
return f"Bill {self.id}: {self.name} ({self.pull_request})"

def log(self, msg, *args):
logger.info(f"Bill %s (#%s): {msg}", self.id, self.pull_request.number, *args) # noqa: G004
def log(self, msg, *args, level=logging.INFO):
logger.log(
level,
f"Bill %s (#%s): {msg}", # noqa: G004
self.id,
self.pull_request.number,
*args,
)
# f-string necessary to let string interpolation work in msg

def get_absolute_url(self) -> str:
Expand Down
4 changes: 3 additions & 1 deletion democrasite/webiscite/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
from :func:`democrasite.webiscite.webhooks`.
"""

from logging import WARNING

import requests
from celery import shared_task
from celery.utils.log import get_task_logger
Expand Down Expand Up @@ -47,7 +49,7 @@ def submit_bill(bill_id: int) -> None:
if merged:
bill.log("Merged")
else:
logger.warning("Bill %s failed to merge", bill.id)
bill.log("Failed to merge", level=WARNING)
return

# Automatically update constitution line numbers if necessary
Expand Down