From 863d0e1c2c4ae8bf52b3b6b74aecca6489e798c2 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Thu, 26 Sep 2019 16:59:09 +1000 Subject: [PATCH] Better way to fix loggerd crash issue --- selfdrive/manager.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/selfdrive/manager.py b/selfdrive/manager.py index e46a45acd..2a4c26666 100755 --- a/selfdrive/manager.py +++ b/selfdrive/manager.py @@ -359,9 +359,7 @@ def manager_thread(): cloudlog.info({"environ": os.environ}) # save boot log - params = Params() - if params.get("DragonEnableLogger") == "1": - subprocess.call(["./loggerd", "--bootlog"], cwd=os.path.join(BASEDIR, "selfdrive/loggerd")) + subprocess.call(["./loggerd", "--bootlog"], cwd=os.path.join(BASEDIR, "selfdrive/loggerd")) params = Params() @@ -605,14 +603,6 @@ def main(): spinner_proc = subprocess.Popen(["./spinner", "http://dragonpilot.cn"], cwd=os.path.join(BASEDIR, "selfdrive", "ui", "spinner"), close_fds=True) - - if params.get("DragonEnableLogger") == "0": - del managed_processes['loggerd'] - del managed_processes['tombstoned'] - - if params.get("DragonEnableUploader") == "0": - del managed_processes['uploader'] - try: manager_update() manager_init() @@ -624,6 +614,13 @@ def main(): if os.getenv("PREPAREONLY") is not None: return + if params.get("DragonEnableLogger") == "0": + del managed_processes['loggerd'] + del managed_processes['tombstoned'] + + if params.get("DragonEnableUploader") == "0": + del managed_processes['uploader'] + # SystemExit on sigterm signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(1))