Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont reset control connection

Browse Source 
This can lead to missed events, and really the connection dying should
be fatal
This commit is contained in:
Kovid Goyal 2020-12-08 13:05:25 +05:30
parent b2f67dd3e0
commit 4a8baa5fec
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/srv/loop.py
View File

@ -433,6 +433,10 @@ class ServerLoop(object):
self.control_in = open(w, 'wb')
self.control_out = open(r, 'rb')
def close_control_connection(self):
self.control_in.close()
self.control_out.close()
def __str__(self):
return "%s(%r)" % (self.__class__.__name__, self.bind_address)
__repr__ = __str__
@ -688,12 +692,11 @@ class ServerLoop(object):
f = self.control_out.recv if iswindows else self.control_out.read
try:
c = f(1)
except (socket.error, OSError):
except (socket.error, OSError) as e:
if not self.ready:
return
self.log.error('Control socket raised an error, resetting')
self.create_control_connection()
continue
self.log.error('Control connection raised an error:', e)
raise
if c == JOB_DONE:
for s, conn, event in self.dispatch_job_results():
yield s, conn, event
@ -702,8 +705,8 @@ class ServerLoop(object):
elif not c:
if not self.ready:
return
self.log.error('Control socket failed to recv(), resetting')
self.create_control_connection()
self.log.error('Control connection failed to read after signalling ready')
raise Exception('Control connection failed to read, something bad happened')
else:
yield s, self.connection_map[s], READ
for s in writable:

2
src/calibre/srv/tests/base.py
View File

@ -115,6 +115,7 @@ class TestServer(Thread):
def __exit__(self, *args):
self.loop.stop()
self.join(self.loop.opts.shutdown_timeout)
self.loop.close_control_connection()
def connect(self, timeout=None, interface=None):
if timeout is None:
@ -157,3 +158,4 @@ class LibraryServer(TestServer):
self.loop.stop()
self.handler.close()
self.join(self.loop.opts.shutdown_timeout)
self.loop.close_control_connection()