Skip to content

emrg: catch AuthError in server stop/restart CLI paths (stale port file → graceful fallback, no crash)#877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
argszero merged 1 commit into from
Aug 19, 2026
Merged

emrg: catch AuthError in server stop/restart CLI paths (stale port file → graceful fallback, no crash) #877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions emrg/__main__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@

from emrg import __version__
from emrg._win import win32_no_window_kwargs
from emrg.connect import cleanup_server, connect_to_server
from emrg.connect import AuthError, cleanup_server, connect_to_server
from websockets.exceptions import ConnectionClosed


Expand DownExpand Up@@ -153,7 +153,7 @@ async def _send_shutdown() -> bool:
"""Send a graceful shutdown message to the daemon. Returns True on success."""
try:
ws = await asyncio.wait_for(connect_to_server(), timeout=3)
except (ConnectionRefusedError, FileNotFoundError, OSError, asyncio.TimeoutError):
except (ConnectionRefusedError, FileNotFoundError, OSError, asyncio.TimeoutError, AuthError):
return False

try:
Expand DownExpand Up@@ -204,7 +204,7 @@ async def _get_pid():
print("daemon stopped.")
else:
print("daemon not running (no pid from ping).")
except (ConnectionClosed, OSError, asyncio.TimeoutError, json.JSONDecodeError):
except (ConnectionClosed, OSError, asyncio.TimeoutError, json.JSONDecodeError, AuthError):
print("daemon not running.")


Expand Down
Loading