From e157bc85b7ed7b7af4b5ed94e70dee0a6ebb1487 Mon Sep 17 00:00:00 2001 From: gryf Date: Tue, 29 Oct 2019 19:34:36 +0100 Subject: [PATCH] Cleanup service module --- ferrit/service.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ferrit/service.py b/ferrit/service.py index 5cb4eaf..b7aab21 100644 --- a/ferrit/service.py +++ b/ferrit/service.py @@ -23,16 +23,16 @@ def main(): 'exists. Default location is current directory.') args = parser.parse_args() + ssh.KEY = args.key - ssh.LOG_PATH = args.log_path - rest.LOG_PATH = args.log_path + rest.LOG_PATH = ssh.LOG_PATH = args.log_path fd, fifo = tempfile.mkstemp(suffix='.fifo', prefix='ferrit.') os.close(fd) os.unlink(fifo) os.mkfifo(fifo) - ssh.FIFO = fifo - rest.FIFO = fifo + ssh.FIFO = rest.FIFO = fifo + try: p1 = multiprocessing.Process(target=ssh.main) p1.daemon = True @@ -43,7 +43,7 @@ def main(): p1.join() p2.join() - except Exception: + finally: os.unlink(fifo)