Add APScheduler dependency and fix scheduler endpoint
This commit is contained in:
parent
ebf3b1f31c
commit
1b84bee868
@ -481,25 +481,33 @@ async def get_scheduler_status():
|
|||||||
"""
|
"""
|
||||||
Get backup scheduler status and job information
|
Get backup scheduler status and job information
|
||||||
"""
|
"""
|
||||||
from app.backups.backend.scheduler import backup_scheduler
|
try:
|
||||||
|
from app.backups.backend.scheduler import backup_scheduler
|
||||||
|
|
||||||
if not backup_scheduler.running:
|
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 {
|
return {
|
||||||
"enabled": settings.BACKUP_ENABLED,
|
"enabled": settings.BACKUP_ENABLED,
|
||||||
"running": False,
|
"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
|
|
||||||
}
|
|
||||||
|
|||||||
@ -9,3 +9,4 @@ jinja2==3.1.4
|
|||||||
aiohttp==3.10.10
|
aiohttp==3.10.10
|
||||||
msal==1.31.1
|
msal==1.31.1
|
||||||
paramiko==3.4.1
|
paramiko==3.4.1
|
||||||
|
apscheduler==3.10.4
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user