FONDLED THE CODE
This commit is contained in:
+32
-2
@@ -4,6 +4,7 @@ import asyncio
|
||||
import logging
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from apscheduler.events import EVENT_JOB_ERROR, EVENT_JOB_EXECUTED, EVENT_JOB_MISSED
|
||||
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
||||
from apscheduler.triggers.cron import CronTrigger
|
||||
from apscheduler.triggers.date import DateTrigger
|
||||
@@ -23,17 +24,21 @@ async def _remind_slot(slot_id: str) -> None:
|
||||
config = load_meds_config()
|
||||
tz = config.timezone
|
||||
day = today_str(tz)
|
||||
logger.info("Reminder triggered slot=%s day=%s", slot_id, day)
|
||||
db = await get_db()
|
||||
try:
|
||||
logs = await get_log_for_day(db, day)
|
||||
if slot_id in logs and logs[slot_id]["status"] == "taken":
|
||||
logger.info("Reminder skipped slot=%s day=%s reason=already_taken", slot_id, day)
|
||||
return
|
||||
slot = next((s for s in config.slots if s.id == slot_id), None)
|
||||
if not slot:
|
||||
logger.warning("Reminder skipped slot=%s day=%s reason=unknown_slot", slot_id, day)
|
||||
return
|
||||
title = f"{slot.label} — Med-Time!"
|
||||
body = pick("reminder", label=slot.label, med=slot.meds[0].name if slot.meds else "Medis")
|
||||
await send_slot_reminder(db, slot_id, title, body)
|
||||
sent = await send_slot_reminder(db, slot_id, title, body)
|
||||
logger.info("Reminder finished slot=%s day=%s sent=%d", slot_id, day, sent)
|
||||
finally:
|
||||
await db.close()
|
||||
|
||||
@@ -61,12 +66,18 @@ async def _generate_daily_oracle() -> None:
|
||||
|
||||
|
||||
async def _evening_check() -> None:
|
||||
logger.info("Evening check triggered")
|
||||
db = await get_db()
|
||||
try:
|
||||
marked = await mark_missed_for_overdue(db)
|
||||
if not marked:
|
||||
logger.info("Evening check done marked=0")
|
||||
return
|
||||
logger.info("Evening check marked missed slots=%s", ",".join(marked))
|
||||
for slot_id in marked:
|
||||
body = pick("missed")
|
||||
await send_slot_reminder(db, slot_id, "Verpasst?", body)
|
||||
sent = await send_slot_reminder(db, slot_id, "Verpasst?", body)
|
||||
logger.info("Evening reminder slot=%s sent=%d", slot_id, sent)
|
||||
finally:
|
||||
await db.close()
|
||||
|
||||
@@ -102,10 +113,26 @@ async def schedule_snooze(slot_id: str, minutes: int) -> str:
|
||||
return until.isoformat()
|
||||
|
||||
|
||||
def _scheduler_listener(event) -> None:
|
||||
if event.code == EVENT_JOB_MISSED:
|
||||
logger.warning(
|
||||
"Scheduler job missed id=%s scheduled=%s",
|
||||
event.job_id,
|
||||
event.scheduled_run_time,
|
||||
)
|
||||
elif event.code == EVENT_JOB_ERROR:
|
||||
logger.exception("Scheduler job error id=%s", event.job_id)
|
||||
elif event.code == EVENT_JOB_EXECUTED:
|
||||
logger.info("Scheduler job executed id=%s", event.job_id)
|
||||
|
||||
|
||||
def start_scheduler() -> None:
|
||||
config = load_meds_config()
|
||||
tz = config.timezone
|
||||
|
||||
if not scheduler.running:
|
||||
scheduler.add_listener(_scheduler_listener, EVENT_JOB_EXECUTED | EVENT_JOB_MISSED | EVENT_JOB_ERROR)
|
||||
|
||||
for slot in config.slots:
|
||||
h, m = slot.time.hour, slot.time.minute
|
||||
scheduler.add_job(
|
||||
@@ -115,6 +142,7 @@ def start_scheduler() -> None:
|
||||
id=f"remind-{slot.id}",
|
||||
replace_existing=True,
|
||||
)
|
||||
logger.info("Registered remind job slot=%s at %02d:%02d %s", slot.id, h, m, tz)
|
||||
|
||||
scheduler.add_job(
|
||||
_evening_check,
|
||||
@@ -140,3 +168,5 @@ def start_scheduler() -> None:
|
||||
if not scheduler.running:
|
||||
scheduler.start()
|
||||
logger.info("Scheduler started for timezone %s", tz)
|
||||
for job in scheduler.get_jobs():
|
||||
logger.info("Scheduler job id=%s next=%s", job.id, job.next_run_time)
|
||||
|
||||
Reference in New Issue
Block a user