From 3ae97fe0e55cfc4db624b93eb8288dad2ec2bf36 Mon Sep 17 00:00:00 2001 From: concordia Date: Sat, 15 Jun 2024 20:33:14 -0500 Subject: [PATCH] wip --- selfdrive/manager/process.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/selfdrive/manager/process.py b/selfdrive/manager/process.py index 3472a2f..07e672d 100755 --- a/selfdrive/manager/process.py +++ b/selfdrive/manager/process.py @@ -20,7 +20,7 @@ from openpilot.common.swaglog import cloudlog WATCHDOG_FN = "/dev/shm/wd_" ENABLE_WATCHDOG = os.getenv("NO_WATCHDOG") is None -def modified_nativelauncher(pargs: list[str], cwd: str, name: str, log_path: str) -> None: +def nativelauncher(pargs: list[str], cwd: str, name: str, log_path: str) -> None: os.environ['MANAGER_DAEMON'] = name log_file_path = os.path.join(log_path, f"{name}.log") with open(log_file_path, 'a') as log_file: @@ -31,7 +31,7 @@ def modified_nativelauncher(pargs: list[str], cwd: str, name: str, log_path: str log_file.write(line) proc.wait() -def modified_launcher(proc: str, name: str, log_path: str) -> None: +def launcher(proc: str, name: str, log_path: str) -> None: try: mod = importlib.import_module(proc) setproctitle(proc) @@ -170,7 +170,7 @@ class NativeProcess(ManagerProcess): self.enabled = enabled self.sigkill = sigkill self.watchdog_max_dt = watchdog_max_dt - self.launcher = modified_nativelauncher + self.launcher = nativelauncher self.always_watchdog = always_watchdog def prepare(self) -> None: @@ -179,7 +179,7 @@ class NativeProcess(ManagerProcess): def start(self, log_path: str) -> None: if self.shutting_down or self.proc is not None: return - self.proc = Process(target=modified_nativelauncher, args=(self.cmdline, os.path.join(BASEDIR, self.cwd), self.name, log_path)) + self.proc = Process(target=nativelauncher, args=(self.cmdline, os.path.join(BASEDIR, self.cwd), self.name, log_path)) self.proc.start() class PythonProcess(ManagerProcess): @@ -200,7 +200,7 @@ class PythonProcess(ManagerProcess): def start(self, log_path: str) -> None: if self.shutting_down or self.proc is not None: return - self.proc = Process(name=self.name, target=modified_launcher, args=(self.module, self.name, log_path)) + self.proc = Process(name=self.name, target=launcher, args=(self.module, self.name, log_path)) self.proc.start() self.watchdog_seen = False self.shutting_down = False