terminate signal is registered too to be able terminate subprocesses

This commit is contained in:
iLLiCiTiT 2019-10-23 14:36:54 +02:00
parent d1bfa2412e
commit 4921783d1a
3 changed files with 5 additions and 3 deletions

View file

@ -68,7 +68,7 @@ class SocketThread(threading.Thread):
if (time.time() - time_socket) > self.MAX_TIMEOUT:
self.log.error("Connection timeout passed. Terminating.")
self._is_running = False
os.kill(self.subproc.pid, signal.SIGINT)
self.subproc.terminate()
break
continue
@ -89,7 +89,7 @@ class SocketThread(threading.Thread):
"Connection timeout passed. Terminating."
)
self._is_running = False
os.kill(self.subproc.pid, signal.SIGINT)
self.subproc.terminate()
break
continue
@ -109,6 +109,6 @@ class SocketThread(threading.Thread):
# Clean up the connection
connection.close()
if self.subproc.poll() is None:
os.kill(self.subproc.pid, signal.SIGINT)
self.subproc.terminate()
self.finished = True

View file

@ -42,5 +42,6 @@ if __name__ == "__main__":
sys.exit(0)
signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
main(sys.argv)

View file

@ -98,5 +98,6 @@ if __name__ == "__main__":
sys.exit(0)
signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
main(sys.argv)