Skip to content

Commit 40ee264

Browse files
committed
Improve logging (use logfmt and avoid logging noops every hour)
1 parent 79e065b commit 40ee264

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

nephthys/__main__.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,16 @@ async def main(_app: Starlette):
5757
from nephthys.tasks.close_stale import close_stale_tickets
5858
from datetime import datetime
5959

60-
scheduler.add_job(
61-
close_stale_tickets,
62-
"interval",
63-
hours=1,
64-
max_instances=1,
65-
next_run_time=datetime.now(),
66-
)
60+
if env.stale_ticket_days:
61+
scheduler.add_job(
62+
close_stale_tickets,
63+
"interval",
64+
hours=1,
65+
max_instances=1,
66+
next_run_time=datetime.now(),
67+
)
68+
else:
69+
logging.debug("Stale ticket closing has not been configured")
6770
scheduler.start()
6871

6972
delete_msg_task = asyncio.create_task(process_queue())

nephthys/tasks/close_stale.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ async def close_stale_tickets():
9191

9292
stale_ticket_days = env.stale_ticket_days
9393
if not stale_ticket_days:
94-
logging.info("Stale ticket auto-close is disabled (STALE_TICKET_DAYS not set)")
94+
logging.warning("Skipping ticket auto-close (STALE_TICKET_DAYS not set)")
9595
return
9696

97-
logging.info(f"Closing stale tickets (threshold: {stale_ticket_days} days)...")
97+
logging.info(f"Closing stale tickets, threshold_days={stale_ticket_days}")
9898
await send_heartbeat(
9999
f"Closing stale tickets (threshold: {stale_ticket_days} days)..."
100100
)
@@ -111,7 +111,7 @@ async def close_stale_tickets():
111111
for i in range(0, len(tickets), batch_size):
112112
batch = tickets[i : i + batch_size]
113113
logging.info(
114-
f"Processing batch {i // batch_size + 1}/{(len(tickets) + batch_size - 1) // batch_size}"
114+
f"Processing stale tickets batch={i // batch_size + 1} batches={(len(tickets) + batch_size - 1) // batch_size}"
115115
)
116116

117117
for ticket in batch:
@@ -140,7 +140,7 @@ async def close_stale_tickets():
140140

141141
await send_heartbeat(f"Closed {stale} stale tickets.")
142142

143-
logging.info(f"Closed {stale} stale tickets.")
143+
logging.info(f"Closed stale tickets. count={stale}")
144144
except Exception as e:
145145
logging.error(f"Error closing stale tickets: {e}")
146146
await send_heartbeat(f"Error closing stale tickets: {e}")

0 commit comments

Comments
 (0)