aboutsummaryrefslogtreecommitdiffstats
path: root/klippy
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-04-04 18:37:20 -0400
committerKevin O'Connor <kevin@koconnor.net>2019-04-04 18:38:46 -0400
commit516fbf4f325bbfec464d9ae00c1e22dad259af59 (patch)
tree98ef49a1eade12c404a2bafbf7921498f28d6056 /klippy
parent79ecee0996452ec102f6d92b11246fc1208c64b2 (diff)
downloadkutter-516fbf4f325bbfec464d9ae00c1e22dad259af59.tar.gz
kutter-516fbf4f325bbfec464d9ae00c1e22dad259af59.tar.xz
kutter-516fbf4f325bbfec464d9ae00c1e22dad259af59.zip
klippy: Report the underlying error on an internal error during connect
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
-rw-r--r--klippy/klippy.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/klippy/klippy.py b/klippy/klippy.py
index c3b8de55..aa8ab66a 100644
--- a/klippy/klippy.py
+++ b/klippy/klippy.py
@@ -147,10 +147,10 @@ class Printer:
logging.exception("MCU error during connect")
self._set_state("%s%s" % (str(e), message_mcu_connect_error))
return
- except:
+ except Exception as e:
logging.exception("Unhandled exception during connect")
- self._set_state("Internal error during connect.%s" % (
- message_restart,))
+ self._set_state("Internal error during connect: %s\n%s" % (
+ str(e), message_restart,))
return
try:
self._set_state(message_ready)
@@ -158,9 +158,10 @@ class Printer:
if self.state_message is not message_ready:
return
cb()
- except:
+ except Exception as e:
logging.exception("Unhandled exception during ready callback")
- self.invoke_shutdown("Internal error during ready callback")
+ self.invoke_shutdown("Internal error during ready callback: %s" % (
+ str(e),))
def run(self):
systime = time.time()
monotime = self.reactor.monotonic()