pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly handle serial close on Macs

Browse source 
Readline could still be stuck in a read loop, leading to an exception on Mac
when closing the connection from another thread. This should now be captured
correctly.

Fixes #1021
This commit is contained in:
Gina Häußge 2015-08-13 17:15:01 +02:00
parent c00b13680f
commit c829b27fdd
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/octoprint/util/comm.py
View file

@ -162,6 +162,7 @@ class MachineCom(object):
self._long_running_command = False self._long_running_command = False
self._heating = False self._heating = False
self._connection_closing = False
self._timeout = None self._timeout = None
@ -429,6 +430,10 @@ class MachineCom(object):
# legacy parameters # legacy parameters
is_error = kwargs.get("isError", is_error) is_error = kwargs.get("isError", is_error)
if self._connection_closing:
return
self._connection_closing = True
if self._temperature_timer is not None: if self._temperature_timer is not None:
try: try:
self._temperature_timer.cancel() self._temperature_timer.cancel()
@ -453,7 +458,13 @@ class MachineCom(object):
self._send_queue.join() self._send_queue.join()
deactivate_monitoring_and_send_queue() deactivate_monitoring_and_send_queue()
self._serial.close()
try:
self._serial.close()
except:
self._logger.exception("Error while trying to close serial port")
is_error = True
if is_error: if is_error:
self._changeState(self.STATE_CLOSED_WITH_ERROR) self._changeState(self.STATE_CLOSED_WITH_ERROR)
else: else:
@ -1379,15 +1390,17 @@ class MachineCom(object):
return line return line
def _readline(self): def _readline(self):
if self._serial == None: if self._serial == None or self._connection_closing:
return None return None
try: try:
ret = self._serial.readline() ret = self._serial.readline()
except: except:
self._logger.exception("Unexpected error while reading from serial port") if not self._connection_closing:
self._log("Unexpected error while reading serial port, please consult octoprint.log for details: %s" % (get_exception_string())) self._logger.exception("Unexpected error while reading from serial port")
self._errorValue = get_exception_string() self._log("Unexpected error while reading serial port, please consult octoprint.log for details: %s" % (get_exception_string()))
self.close(is_error=True) self._errorValue = get_exception_string()
self.close(is_error=True)
return None return None
if ret == '': if ret == '':
#self._log("Recv: TIMEOUT") #self._log("Recv: TIMEOUT")
@ -1711,6 +1724,9 @@ class MachineCom(object):
self._doSendWithoutChecksum(commandToSend) self._doSendWithoutChecksum(commandToSend)
def _doSendWithoutChecksum(self, cmd): def _doSendWithoutChecksum(self, cmd):
if self._serial is None or self._connection_closing:
return
self._log("Send: %s" % cmd) self._log("Send: %s" % cmd)
try: try:
self._serial.write(cmd + '\n') self._serial.write(cmd + '\n')
@ -1719,15 +1735,17 @@ class MachineCom(object):
try: try:
self._serial.write(cmd + '\n') self._serial.write(cmd + '\n')
except: except:
if not self._connection_closing:
self._logger.exception("Unexpected error while writing to serial port")
self._log("Unexpected error while writing to serial port: %s" % (get_exception_string()))
self._errorValue = get_exception_string()
self.close(is_error=True)
except:
if not self._connection_closing:
self._logger.exception("Unexpected error while writing to serial port") self._logger.exception("Unexpected error while writing to serial port")
self._log("Unexpected error while writing to serial port: %s" % (get_exception_string())) self._log("Unexpected error while writing to serial port: %s" % (get_exception_string()))
self._errorValue = get_exception_string() self._errorValue = get_exception_string()
self.close(is_error=True) self.close(is_error=True)
except:
self._logger.exception("Unexpected error while writing to serial port")
self._log("Unexpected error while writing to serial port: %s" % (get_exception_string()))
self._errorValue = get_exception_string()
self.close(is_error=True)
##~~ command handlers ##~~ command handlers