From f290642ff823967f3446501338530eab677ffac9 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 2 Aug 2021 19:47:52 +0000 Subject: [PATCH] daemon.py: simplify exception handling --- mmgen/daemon.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/mmgen/daemon.py b/mmgen/daemon.py index b8fcaa2b..851fed4f 100755 --- a/mmgen/daemon.py +++ b/mmgen/daemon.py @@ -72,8 +72,7 @@ class Daemon(MMGenObject): try: cp = run(cmd,check=False,stdout=PIPE,stderr=PIPE) except Exception as e: - ymsg(f'Error starting executable: {type(e).__name__} [Errno {e.errno}]') - raise + raise MMGenCalledProcessError(f'Error starting executable: {type(e).__name__} [Errno {e.errno}]') if self.debug: print(cp) return cp @@ -173,16 +172,7 @@ class Daemon(MMGenObject): # leading to interesting consequences. os.unlink(self.pidfile) - for i in range(20): - try: - ret = self.do_start(silent=silent) - except Exception as e: - ymsg(str(e)) - else: - break - time.sleep(1) - else: - die(2,'Unable to start daemon') + ret = self.do_start(silent=silent) if self.wait: self.wait_for_state('ready')