ling/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-04-28 06:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(update): avoid launchd restart race on macOS

Browse Source
This commit is contained in:
Dave Tist
2026-03-30 04:05:43 +02:00
committed by Teknium
parent 7165eff901
commit 988ecc7420
2 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
hermes_cli/main.py
View File

@@ -3269,8 +3269,8 @@ def cmd_update(args):
from gateway.status import get_running_pid, remove_pid_file
from hermes_cli.gateway import (
get_service_name, get_launchd_plist_path, is_macos, is_linux,
refresh_launchd_plist_if_needed,
_ensure_user_systemd_env, get_systemd_linger_status,
launchd_restart, _ensure_user_systemd_env,
get_systemd_linger_status,
)
import signal as _signal
@@ -3374,26 +3374,16 @@ def cmd_update(args):
print(" System services may require root. Try:")
print(f" sudo systemctl restart {_gw_service_name}")
elif has_launchd_service:
# Refresh the plist first (picks up --replace and other
# changes from the update we just pulled).
refresh_launchd_plist_if_needed()
# Explicit stop+start — don't rely on KeepAlive respawn
# after a manual SIGTERM, which would race with the
# PID file cleanup.
# Use the shared launchd restart helper so we wait for the
# old gateway process to fully exit before starting the new
# one. This avoids stop/start races during self-update.
print("→ Restarting gateway service...")
_launchd_label = get_launchd_label()
stop = subprocess.run(
["launchctl", "stop", _launchd_label],
capture_output=True, text=True, timeout=10,
)
start = subprocess.run(
["launchctl", "start", _launchd_label],
capture_output=True, text=True, timeout=10,
)
if start.returncode == 0:
try:
launchd_restart()
print("✓ Gateway restarted via launchd.")
else:
print(f"⚠ Gateway restart failed: {start.stderr.strip()}")
except subprocess.CalledProcessError as e:
stderr = (getattr(e, "stderr", "") or "").strip()
print(f"⚠ Gateway restart failed: {stderr}")
print(" Try manually: hermes gateway restart")
elif existing_pid:
try:

13
tests/hermes_cli/test_update_gateway_restart.py
View File

@@ -307,21 +307,14 @@ class TestCmdUpdateLaunchdRestart:
# Mock get_running_pid to return a PID
with patch("gateway.status.get_running_pid", return_value=12345), \
patch("gateway.status.remove_pid_file"):
patch("gateway.status.remove_pid_file"), \
patch.object(gateway_cli, "launchd_restart") as mock_launchd_restart:
cmd_update(mock_args)
captured = capsys.readouterr().out
assert "Gateway restarted via launchd" in captured
assert "Restart it with: hermes gateway run" not in captured
# Verify launchctl stop + start were called (not manual SIGTERM)
launchctl_calls = [
c for c in mock_run.call_args_list
if len(c.args[0]) > 0 and c.args[0][0] == "launchctl"
]
stop_calls = [c for c in launchctl_calls if "stop" in c.args[0]]
start_calls = [c for c in launchctl_calls if "start" in c.args[0]]
assert len(stop_calls) >= 1
assert len(start_calls) >= 1
mock_launchd_restart.assert_called_once_with()
@patch("shutil.which", return_value=None)
@patch("subprocess.run")