NetFH.close() mehrfach aufrufbar ohne Fehler

Socket schließen, wenn Fehler bei Verbindung
This commit is contained in:
2017-09-21 12:59:25 +02:00
parent f679e66ead
commit d34d37f109
2 changed files with 12 additions and 11 deletions

View File

@@ -77,7 +77,7 @@ class NetFH(Thread):
try:
so.connect(self._address)
except:
pass
so.close()
else:
# Alten Socket trennen
with self.__socklock:
@@ -129,14 +129,15 @@ class NetFH(Thread):
self.__sockerr.set()
# Vom Socket sauber trennen
with self.__socklock:
try:
if self.__sockend:
self._slavesock.send(_sysexit)
else:
self._slavesock.shutdown(socket.SHUT_RDWR)
except:
pass
if self._slavesock is not None:
with self.__socklock:
try:
if self.__sockend:
self._slavesock.send(_sysexit)
else:
self._slavesock.shutdown(socket.SHUT_RDWR)
except:
pass
self._slavesock.close()
def flush(self):