From 4921783d1a25976275dc0ebf22333d0114d2b7e7 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 23 Oct 2019 14:36:54 +0200 Subject: [PATCH] terminate signal is registered too to be able terminate subprocesses --- .../ftrack_server/parallel_event_server/socket_thread.py | 6 +++--- .../parallel_event_server/sub_event_processor.py | 1 + .../ftrack_server/parallel_event_server/sub_event_storer.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pype/ftrack/ftrack_server/parallel_event_server/socket_thread.py b/pype/ftrack/ftrack_server/parallel_event_server/socket_thread.py index deede2ed03..1ec4eca57f 100644 --- a/pype/ftrack/ftrack_server/parallel_event_server/socket_thread.py +++ b/pype/ftrack/ftrack_server/parallel_event_server/socket_thread.py @@ -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 diff --git a/pype/ftrack/ftrack_server/parallel_event_server/sub_event_processor.py b/pype/ftrack/ftrack_server/parallel_event_server/sub_event_processor.py index bd3118a893..a795775a94 100644 --- a/pype/ftrack/ftrack_server/parallel_event_server/sub_event_processor.py +++ b/pype/ftrack/ftrack_server/parallel_event_server/sub_event_processor.py @@ -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) diff --git a/pype/ftrack/ftrack_server/parallel_event_server/sub_event_storer.py b/pype/ftrack/ftrack_server/parallel_event_server/sub_event_storer.py index bf2dd0eefa..864b4b7c1d 100644 --- a/pype/ftrack/ftrack_server/parallel_event_server/sub_event_storer.py +++ b/pype/ftrack/ftrack_server/parallel_event_server/sub_event_storer.py @@ -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)