From d1da6100a6ce3cf832397953a852b2027b648b25 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 12 Sep 2018 19:11:20 -0400 Subject: [PATCH] klippy: Remove unneeded loop in run() method Signed-off-by: Kevin O'Connor --- klippy/klippy.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/klippy/klippy.py b/klippy/klippy.py index f0935587..9427036a 100644 --- a/klippy/klippy.py +++ b/klippy/klippy.py @@ -260,24 +260,23 @@ class Printer: monotime = self.reactor.monotonic() logging.info("Start printer at %s (%.1f %.1f)", time.asctime(time.localtime(systime)), systime, monotime) - while 1: - # Enter main reactor loop - try: - self.reactor.run() - except: - logging.exception("Unhandled exception during run") - return "error_exit" - # Check restart flags - run_result = self.run_result - try: - if run_result == 'firmware_restart': - for n, m in self.lookup_objects(module='mcu'): - m.microcontroller_restart() - for cb in self.state_cb: - cb('disconnect') - except: - logging.exception("Unhandled exception during post run") - return run_result + # Enter main reactor loop + try: + self.reactor.run() + except: + logging.exception("Unhandled exception during run") + return "error_exit" + # Check restart flags + run_result = self.run_result + try: + if run_result == 'firmware_restart': + for n, m in self.lookup_objects(module='mcu'): + m.microcontroller_restart() + for cb in self.state_cb: + cb('disconnect') + except: + logging.exception("Unhandled exception during post run") + return run_result def invoke_shutdown(self, msg): if self.is_shutdown: return