From b27a19e9d1cfe9e9f94ccb4978338ebe4a898bc3 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 14 Dec 2021 20:43:26 -0800 Subject: [PATCH] cloudlog: add daemon name to context for python daemons (#23225) * python * manager is a daemon too * Update selfdrive/manager/process.py Co-authored-by: Comma Device --- selfdrive/manager/manager.py | 1 + selfdrive/manager/process.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/selfdrive/manager/manager.py b/selfdrive/manager/manager.py index f9bda4c3a1f9be..196673d4679170 100755 --- a/selfdrive/manager/manager.py +++ b/selfdrive/manager/manager.py @@ -117,6 +117,7 @@ def manager_cleanup(): def manager_thread(): + cloudlog.bind(daemon="manager") cloudlog.info("manager start") cloudlog.info({"environ": os.environ}) diff --git a/selfdrive/manager/process.py b/selfdrive/manager/process.py index d9a1619411a390..22d75edce7830a 100644 --- a/selfdrive/manager/process.py +++ b/selfdrive/manager/process.py @@ -22,7 +22,7 @@ ENABLE_WATCHDOG = os.getenv("NO_WATCHDOG") is None -def launcher(proc): +def launcher(proc, name): try: # import the process mod = importlib.import_module(proc) @@ -33,6 +33,9 @@ def launcher(proc): # create new context since we forked messaging.context = messaging.Context() + # add daemon name to cloudlog ctx + cloudlog.bind(daemon=name) + # exec the process mod.main() except KeyboardInterrupt: @@ -223,7 +226,7 @@ def start(self): return cloudlog.info("starting python %s" % self.module) - self.proc = Process(name=self.name, target=launcher, args=(self.module,)) + self.proc = Process(name=self.name, target=launcher, args=(self.module, self.name)) self.proc.start() self.watchdog_seen = False self.shutting_down = False