62baadb06f
Backend: - schedule_tenant: NC 新容器自動 pgsql 安裝 (_nc_db_check 全新容器處理) - schedule_tenant: NC 初始化加入 Redis + APCu memcache 設定 (修正 OIDC invalid_state) - schedule_tenant: 新租戶 KC realm 自動設定 accessCodeLifespan=600s (修正 authentication_expired) - schedule_account: NC Mail 帳號自動設定 (nc_mail_result/nc_mail_done_at) - schedule_account: NC 台灣國定假日行事曆自動訂閱 (CalDAV MKCALENDAR) - nextcloud_client: 新增 subscribe_calendar() CalDAV 訂閱方法 - settings: 新增系統設定 API (site_title/version/timezone/SSO/Keycloak) - models/result: 新增 nc_mail_result, nc_mail_done_at 欄位 - alembic: 遷移 002(system_settings) 003(keycloak_admin) 004(nc_mail_result) Frontend (Admin Portal): - 新增完整管理後台 (index/tenants/accounts/servers/schedules/logs/settings/system-status) - api.js: Keycloak JS Adapter SSO 整合 (PKCE/S256, fallback KC JS 來源, 自動 token 更新) - index.html: Promise.allSettled 取代 Promise.all，防止單一 API 失敗影響整頁 - 所有頁面加入 try/catch + toast 錯誤處理 - 新增品牌 LOGO 與 favicon Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
72 lines
2.2 KiB
Python
72 lines
2.2 KiB
Python
"""
|
|
Schedule dispatcher: routes schedule_id to the correct run function.
|
|
Also used by manual trigger API.
|
|
"""
|
|
import logging
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.core.database import SessionLocal
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def dispatch_schedule(schedule_id: int, log_id: int = None, db: Session = None):
|
|
"""
|
|
Dispatch to correct schedule function.
|
|
When called from watchdog, db and log_id are provided.
|
|
When called from manual API, creates its own session and log.
|
|
"""
|
|
own_db = db is None
|
|
own_log = False
|
|
log_obj = None
|
|
|
|
if own_db:
|
|
db = SessionLocal()
|
|
|
|
if log_id is None:
|
|
from app.core.utils import now_tw
|
|
from app.models.schedule import ScheduleLog, Schedule
|
|
schedule = db.get(Schedule, schedule_id)
|
|
if not schedule:
|
|
if own_db:
|
|
db.close()
|
|
return
|
|
log_obj = ScheduleLog(
|
|
schedule_id=schedule_id,
|
|
schedule_name=schedule.name,
|
|
started_at=now_tw(),
|
|
status="running",
|
|
)
|
|
db.add(log_obj)
|
|
db.commit()
|
|
db.refresh(log_obj)
|
|
log_id = log_obj.id
|
|
own_log = True
|
|
|
|
final_status = "error"
|
|
try:
|
|
if schedule_id == 1:
|
|
from app.services.scheduler.schedule_tenant import run_tenant_check
|
|
run_tenant_check(log_id, db)
|
|
elif schedule_id == 2:
|
|
from app.services.scheduler.schedule_account import run_account_check
|
|
run_account_check(log_id, db)
|
|
elif schedule_id == 3:
|
|
from app.services.scheduler.schedule_system import run_system_status
|
|
run_system_status(log_id, db)
|
|
else:
|
|
logger.warning(f"Unknown schedule_id: {schedule_id}")
|
|
final_status = "ok"
|
|
except Exception as e:
|
|
logger.exception(f"dispatch_schedule({schedule_id}) error: {e}")
|
|
raise
|
|
finally:
|
|
# When called from manual trigger (own_log), finalize the log entry
|
|
if own_log and log_obj is not None:
|
|
from app.core.utils import now_tw
|
|
log_obj.ended_at = now_tw()
|
|
log_obj.status = final_status
|
|
db.commit()
|
|
if own_db:
|
|
db.close()
|