Skip to content

fix(gateway): handle CREATE_BREAKAWAY_FROM_JOB rejection on Windows /restart #49043

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

Closed
deepbluetseng wants to merge 1 commit into from
Closed

fix(gateway): handle CREATE_BREAKAWAY_FROM_JOB rejection on Windows /restart #49043

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
35 changes: 27 additions & 8 deletions gateway/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4530,7 +4530,10 @@ async def _launch_detached_restart_command(self) -> None:
# that triggered the /restart command closing its console.
if sys.platform == "win32":
import textwrap
from hermes_cli._subprocess_compat import windows_detach_popen_kwargs
from hermes_cli._subprocess_compat import (
windows_detach_flags_without_breakaway,
windows_detach_popen_kwargs,
)

cmd_argv = [*hermes_cmd, "gateway", "restart"]
watcher = textwrap.dedent(
Expand Down Expand Up @@ -4596,13 +4599,29 @@ def _alive(p):
if watcher_env.get("PYTHONPATH"):
pythonpath.append(watcher_env["PYTHONPATH"])
watcher_env["PYTHONPATH"] = os.pathsep.join(dict.fromkeys(pythonpath))
subprocess.Popen(
[sys.executable, "-c", watcher, str(current_pid), *cmd_argv],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
env=watcher_env,
**windows_detach_popen_kwargs(),
)
try:
subprocess.Popen(
[sys.executable, "-c", watcher, str(current_pid), *cmd_argv],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
env=watcher_env,
**windows_detach_popen_kwargs(),
)
except OSError:
# Windows Scheduled Tasks put the process in a job object
# without JOB_OBJECT_LIMIT_BREAKAWAY_OK, causing
# CREATE_BREAKAWAY_FROM_JOB to fail with ERROR_ACCESS_DENIED
# (WinError 5). Retry without the breakaway flag —
# DETACHED_PROCESS alone is sufficient to survive console
# closure in the Scheduled Task / pythonw.exe scenario.
subprocess.Popen(
[sys.executable, "-c", watcher, str(current_pid), *cmd_argv],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
env=watcher_env,
creationflags=windows_detach_flags_without_breakaway(),
close_fds=True,
)
return

cmd = " ".join(shlex.quote(part) for part in hermes_cmd)
Expand Down