mirror of
https://github.com/myronblair/jarvis
synced 2026-06-30 17:50:23 -05:00
Fix Windows agent: exit(1) after self-update so SCM restarts the service
After writing the updated script, _stop_event.set() caused a clean exit (code 0). SCM failure recovery only fires on non-zero exit, so the service stayed down permanently after every auto-update. Fix: set _update_restart=True before signalling stop; SvcDoRun() checks the flag after main() returns and calls sys.exit(1), which triggers the sc.exe failure recovery chain (restart/5s/10s/30s configured at install).
This commit is contained in:
@@ -38,8 +38,9 @@ LOG_PATH = INSTALL_DIR / "jarvis-agent.log"
|
||||
AGENT_VERSION = "3.1"
|
||||
|
||||
# Set by the service wrapper so self_update knows to stop instead of exec
|
||||
_is_service = False
|
||||
_stop_event = threading.Event()
|
||||
_is_service = False
|
||||
_stop_event = threading.Event()
|
||||
_update_restart = False # True when stopping for self-update; triggers SCM restart
|
||||
|
||||
# ── Logging ────────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -420,7 +421,8 @@ def self_update(cfg: dict) -> bool:
|
||||
with open(script_path, "wb") as f:
|
||||
f.write(new_content)
|
||||
if _is_service:
|
||||
# Signal the main loop to exit; SCM failure-recovery will restart us
|
||||
global _update_restart
|
||||
_update_restart = True
|
||||
log("Running as service — stopping for SCM-managed restart after update.")
|
||||
_stop_event.set()
|
||||
else:
|
||||
@@ -590,6 +592,9 @@ if _HAS_WIN32:
|
||||
(self._svc_name_, ""),
|
||||
)
|
||||
main()
|
||||
if _update_restart:
|
||||
# Non-zero exit triggers SCM failure recovery → automatic restart
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user