From 1772e7bf8d887c059d28ca923448e5fd925285b8 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 29 Oct 2021 17:15:47 +0200
Subject: [PATCH] OP-1905 - implemented exit on key interrupt

---
 .../modules/default_modules/sync_server/sync_server.py |  1 +
 .../default_modules/sync_server/sync_server_module.py  |  1 +
 openpype/pype_commands.py                              | 10 +++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/default_modules/sync_server/sync_server.py b/openpype/modules/default_modules/sync_server/sync_server.py
index 2227ec9366..48df5aad1b 100644
--- a/openpype/modules/default_modules/sync_server/sync_server.py
+++ b/openpype/modules/default_modules/sync_server/sync_server.py
@@ -246,6 +246,7 @@ class SyncServerThread(threading.Thread):
 
             asyncio.ensure_future(self.check_shutdown(), loop=self.loop)
             asyncio.ensure_future(self.sync_loop(), loop=self.loop)
+            log.info("Sync Server Started")
             self.loop.run_forever()
         except Exception:
             log.warning(
diff --git a/openpype/modules/default_modules/sync_server/sync_server_module.py b/openpype/modules/default_modules/sync_server/sync_server_module.py
index 1fee0b4676..281491eedf 100644
--- a/openpype/modules/default_modules/sync_server/sync_server_module.py
+++ b/openpype/modules/default_modules/sync_server/sync_server_module.py
@@ -771,6 +771,7 @@ class SyncServerModule(OpenPypeModule, ITrayModule):
             log.info("Stopping sync server server")
             self.sync_server_thread.is_running = False
             self.sync_server_thread.stop()
+            log.info("Sync server stopped")
         except Exception:
             log.warning(
                 "Error has happened during Killing sync server",
diff --git a/openpype/pype_commands.py b/openpype/pype_commands.py
index cfa16012d0..e160db0f15 100644
--- a/openpype/pype_commands.py
+++ b/openpype/pype_commands.py
@@ -3,7 +3,6 @@
 import os
 import sys
 import json
-from datetime import datetime
 import time
 
 from openpype.lib import PypeLogger
@@ -332,8 +331,17 @@ class PypeCommands:
 
     def syncserver(self, active_site):
         """Start running sync_server in background."""
+        import signal
         os.environ["SITE_SYNC_LOCAL_ID"] = active_site
 
+        def signal_handler(sig, frame):
+            print("You pressed Ctrl+C. Process ended.")
+            sync_server_module.server_exit()
+            sys.exit(0)
+
+        signal.signal(signal.SIGINT, signal_handler)
+        signal.signal(signal.SIGTERM, signal_handler)
+
         from openpype.modules import ModulesManager
 
         manager = ModulesManager()