Error properly on startup

kolibri/utils/server.py

@@ -277,17 +277,14 @@ def SERVING(self, port):
         register_zeroconf_service(port=port or self.port)
 
     def STOP(self):
-        from kolibri.core.tasks.main import scheduler
-
-        scheduler.shutdown_scheduler()
-        if self.workers is not None:
-            for worker in self.workers:
-                worker.shutdown()
         from kolibri.core.discovery.utils.network.search import (
             unregister_zeroconf_service,
         )
 
         unregister_zeroconf_service()
+        from kolibri.core.tasks.main import scheduler
+
+        scheduler.shutdown_scheduler()
 
         if self.workers is not None:
             for worker in self.workers:
@@ -324,7 +321,7 @@ def __init__(self, bus, port, zip_port, pid_file=PID_FILE):
             handler.priority = 10
             self.bus.subscribe(bus_status, handler)
 
-    def set_pid_file(self, status):
+    def set_pid_file(self, status, *args):
         """
         Writes a PID file in the format Kolibri parses
 
@@ -386,9 +383,9 @@ def __init__(self, bus):
 
         self.handlers.update(
             {
-                "SIGINT": self.handle_SIGTERM,
-                "CTRL_C_EVENT": self.handle_SIGTERM,
-                "CTRL_BREAK_EVENT": self.handle_SIGTERM,
+                "SIGINT": self.handle_SIGINT,
+                "CTRL_C_EVENT": self.handle_SIGINT,
+                "CTRL_BREAK_EVENT": self.handle_SIGINT,
             }
         )
 
@@ -405,6 +402,11 @@ def subscribe(self):
     def ENTER(self):
         self.process_pid = os.getpid()
 
+    def handle_SIGINT(self):
+        """Transition to the EXITED state."""
+        self.bus.log("Keyboard interrupt caught. Exiting.")
+        self.bus.transition("EXITED")
+
 
 class ProcessControlPlugin(Monitor):
     def __init__(self, bus):

kolibri/utils/tests/test_server.py

@@ -178,9 +178,8 @@ def test_services_shutdown_on_stop(self, unregister_zeroconf_service):
 
             # Do we shutdown workers correctly?
             for mock_worker in services_plugin.workers:
-                assert mock_worker.shutdown.call_count == 2
+                assert mock_worker.shutdown.call_count == 1
                 assert mock_worker.mock_calls == [
-                    mock.call.shutdown(),
                     mock.call.shutdown(wait=True),
                 ]