Merge branch 'main' into pr-1339

Made-with: Cursor

# Conflicts:
#	nanobot/cron/service.py
This commit is contained in:
Re-bin
2026-03-01 06:06:01 +00:00

View File

@@ -69,13 +69,19 @@ class CronService:
on_job: Callable[[CronJob], Coroutine[Any, Any, str | None]] | None = None on_job: Callable[[CronJob], Coroutine[Any, Any, str | None]] | None = None
): ):
self.store_path = store_path self.store_path = store_path
self.on_job = on_job # Callback to execute job, returns response text self.on_job = on_job
self._store: CronStore | None = None self._store: CronStore | None = None
self._last_mtime: float = 0.0
self._timer_task: asyncio.Task | None = None self._timer_task: asyncio.Task | None = None
self._running = False self._running = False
def _load_store(self) -> CronStore: def _load_store(self) -> CronStore:
"""Load jobs from disk.""" """Load jobs from disk. Reloads automatically if file was modified externally."""
if self._store and self.store_path.exists():
mtime = self.store_path.stat().st_mtime
if mtime != self._last_mtime:
logger.info("Cron: jobs.json modified externally, reloading")
self._store = None
if self._store: if self._store:
return self._store return self._store
@@ -164,7 +170,8 @@ class CronService:
} }
self.store_path.write_text(json.dumps(data, indent=2, ensure_ascii=False), encoding="utf-8") self.store_path.write_text(json.dumps(data, indent=2, ensure_ascii=False), encoding="utf-8")
self._last_mtime = self.store_path.stat().st_mtime
async def start(self) -> None: async def start(self) -> None:
"""Start the cron service.""" """Start the cron service."""
self._running = True self._running = True