mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
Remove a clause that was leaving worker connections in a bad state
This commit is contained in:
parent
51dfaaa70c
commit
c01ea09e9f
@ -481,13 +481,10 @@ class MWorker(multiprocessing.Process):
|
||||
if exc.errno == errno.EINTR:
|
||||
continue
|
||||
raise exc
|
||||
# Changes here create a zeromq condition, check with thatch45 before
|
||||
# making and zeromq changes
|
||||
except KeyboardInterrupt:
|
||||
if socket.closed is False:
|
||||
socket.setsockopt(zmq.LINGER, 2500)
|
||||
socket.close()
|
||||
finally:
|
||||
if context.closed is False:
|
||||
context.term()
|
||||
socket.close()
|
||||
|
||||
def _handle_payload(self, payload):
|
||||
'''
|
||||
|
Loading…
Reference in New Issue
Block a user