mawei
/
openpilot0
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

manager: watchdog restart UI with SIGKILL (#28523) 

old-commit-hash: 58d32a70d7
This commit is contained in:
Adeeb Shihadeh 2023-06-12 21:46:20 -07:00 committed by GitHub
parent 8aa845a1c8
commit 2b9b5e3646
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
selfdrive/manager/process.py
View File

@ -91,7 +91,7 @@ class ManagerProcess(ABC):
pass
def restart(self) -> None:
self.stop()
self.stop(sig=signal.SIGKILL)
self.start()
def check_watchdog(self, started: bool) -> None:
@ -108,21 +108,21 @@ class ManagerProcess(ABC):
dt = sec_since_boot() - self.last_watchdog_time / 1e9
if dt > self.watchdog_max_dt:
# Only restart while offroad for now
if self.watchdog_seen and ENABLE_WATCHDOG:
cloudlog.error(f"Watchdog timeout for {self.name} (exitcode {self.proc.exitcode}) restarting ({started=})")
self.restart()
else:
self.watchdog_seen = True
def stop(self, retry: bool=True, block: bool=True) -> Optional[int]:
def stop(self, retry: bool = True, block: bool = True, sig: Optional[signal.Signals] = None) -> Optional[int]:
if self.proc is None:
return None
if self.proc.exitcode is None:
if not self.shutting_down:
cloudlog.info(f"killing {self.name}")
sig = signal.SIGKILL if self.sigkill else signal.SIGINT
if sig is None:
sig = signal.SIGKILL if self.sigkill else signal.SIGINT
self.signal(sig)
self.shutting_down = True
@ -285,7 +285,7 @@ class DaemonProcess(ManagerProcess):
params.put(self.param_name, str(proc.pid))
def stop(self, retry=True, block=True) -> None:
def stop(self, retry=True, block=True, sig=None) -> None:
pass