Skip to content

Commit 71d796b

Browse files
authored
Dont crash threadless if work shutdown errors out (#1509)
1 parent 5076c30 commit 71d796b

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

proxy/core/work/threadless.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,17 @@ def _cleanup(self, work_id: int) -> None:
333333
self.selector.unregister(fileno)
334334
self.registered_events_by_work_ids[work_id].clear()
335335
del self.registered_events_by_work_ids[work_id]
336-
self.works[work_id].shutdown()
337-
del self.works[work_id]
338-
if self.work_queue_fileno() is not None:
339-
os.close(work_id)
336+
try:
337+
self.works[work_id].shutdown()
338+
except Exception as exc:
339+
logger.exception(
340+
'Error when shutting down work#{0}'.format(work_id),
341+
exc_info=exc,
342+
)
343+
finally:
344+
del self.works[work_id]
345+
if self.work_queue_fileno() is not None:
346+
os.close(work_id)
340347

341348
def _create_tasks(
342349
self,

0 commit comments

Comments
 (0)