diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh index 91a510b..de12795 100644 --- a/core/scripts/scheduler.sh +++ b/core/scripts/scheduler.sh @@ -27,10 +27,10 @@ EOF systemctl daemon-reload systemctl enable hysteria-scheduler.service systemctl start hysteria-scheduler.service - + wait 2 (crontab -l | grep -v "hysteria2_venv.*traffic-status" | grep -v "hysteria2_venv.*backup-hysteria") | crontab - - return 0 + # return 0 } check_scheduler_service() { diff --git a/upgrade.sh b/upgrade.sh index 14c1b1c..2c498f7 100644 --- a/upgrade.sh +++ b/upgrade.sh @@ -97,12 +97,18 @@ success "Python environment ready." # ========== Scheduler ========== info "Ensuring scheduler is set..." -source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh" -if ! check_scheduler_service; then - info "Installing Hysteria scheduler service..." - setup_hysteria_scheduler +if source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"; then + if ! check_scheduler_service; then + if setup_hysteria_scheduler; then + success "Scheduler service configured." + else + warn "Scheduler setup failed, but continuing upgrade..." + fi + else + success "Scheduler already set." + fi else - error "Hysteria scheduler configuration failed critically. Upgrade cannot proceed." + warn "Failed to source scheduler.sh, continuing without scheduler setup..." fi # ========== Restart Services ==========