From 1b84bee8684c20c5f53b2e800c8456c88c7dc16e Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 2 Jan 2026 02:28:33 +0100 Subject: [PATCH] Add APScheduler dependency and fix scheduler endpoint --- VERSION | 2 +- app/backups/backend/router.py | 44 +++++++++++++++++++++-------------- requirements.txt | 1 + 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/VERSION b/VERSION index d34d1c3..294f40b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.73 \ No newline at end of file +1.3.74 \ No newline at end of file diff --git a/app/backups/backend/router.py b/app/backups/backend/router.py index e68b929..d2ac3b3 100644 --- a/app/backups/backend/router.py +++ b/app/backups/backend/router.py @@ -481,25 +481,33 @@ async def get_scheduler_status(): """ Get backup scheduler status and job information """ - from app.backups.backend.scheduler import backup_scheduler - - if not backup_scheduler.running: + try: + from app.backups.backend.scheduler import backup_scheduler + + if not backup_scheduler.running: + return { + "enabled": settings.BACKUP_ENABLED, + "running": False, + "message": "Backup scheduler is not running" + } + + jobs = [] + for job in backup_scheduler.scheduler.get_jobs(): + jobs.append({ + "id": job.id, + "name": job.name, + "next_run": job.next_run_time.isoformat() if job.next_run_time else None, + }) + + return { + "enabled": settings.BACKUP_ENABLED, + "running": backup_scheduler.running, + "jobs": jobs + } + except Exception as e: + logger.warning("Scheduler not available: %s", str(e)) return { "enabled": settings.BACKUP_ENABLED, "running": False, - "message": "Backup scheduler is not running" + "message": f"Scheduler error: {str(e)}" } - - jobs = [] - for job in backup_scheduler.scheduler.get_jobs(): - jobs.append({ - "id": job.id, - "name": job.name, - "next_run": job.next_run_time.isoformat() if job.next_run_time else None, - }) - - return { - "enabled": settings.BACKUP_ENABLED, - "running": backup_scheduler.running, - "jobs": jobs - } diff --git a/requirements.txt b/requirements.txt index 7edef66..c545c31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,3 +9,4 @@ jinja2==3.1.4 aiohttp==3.10.10 msal==1.31.1 paramiko==3.4.1 +apscheduler==3.10.4