Fixes #111 - stupid error in the signals management... some refinements

mohierf · mohierf · commit 4cde762528fd · 2018-08-14T06:45:32.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -53,7 +53,7 @@ jobs:
           tags: true
         user: alignak
         password:
-          secure: "RpL6CArq0yC734lzOh3ERq5p67274RayoiqLvEb5r5Sas+Zv0lcrEHNLT8v1fwIs0aJBZEE8NnXyTwD3bK03MGoRYGb00viVV/8x3ASYhvZ6MW41LcnLIDJRL2ZqhCU9LWcgkbGDxYoiuObedMvtwtj/iADjkQ9T7R/X9waWCLgfxOZtXDE3xnEBYXrntvGPYd/KQkrQQ1pg5SC74sdIsnHcsN5j7Dt/HlSNDv0CZaZ8zptg7dIlbn472+2TTesiyIFcEoFviGw6UmElkUTwkxyH0ix8mX1unibwaROHM/YJoz06GmAgPzjXmdAFvccWqCtp8uYMVitJSt8/JUIhsXntJM2yIhzCE/SRT7HIU0Z7IiQwjaY6bhGha8o0DmSIYdc+3cARtna5/alGGv5xQxF2TTZGEZJeOKsQsXfh9G8SpLjdl+2eznMgAO5G0SOxBs57ovSMrFmhpA3qjz8kVLgroNvEOE9gd2+9NjXm5p7ioxlXpixwWhSEkMDLP8jH7RzvnFMw+iAjeYJMYpjGAyzViDE09tsgwWlsu3aw69LBRDVS9/3b8Cb0FG7/uxffTtYc79KLI2XPt2eQRi1SihnR8mpXHqE4A5fAVn6sUmsyUMFriJipsUwaAEBNgXioGR99iDgkoEHaxFSl5cW0R/JOCoKr1Q/Bs3NjH3WBcTw="
+          secure: "a5MNlvUNtFuQzaQc0ygYi5J0xZnEyUcwdcTAlZ17BUk1vXicb5kxBS/Yt7GXHYFxq9pqxEy0NDctTf8o0VumZVZpRfFoghzcOpO2lkSc5L1LCaEOl/v1o2kb31aT/kRuCWbFKHBXj7pDj10UyjMILcR6GdV2UVawShlSi92qo/WAKDiTaJR2wMI7zDViX6B5D3jUsPVP9TQDkzqnO5ELTbOn3eMbj7CvXjpzUxN9QxBWofzw8kLJLubo/9z0XpW83T9cYaU0rYHsBtqYnD82ZP0/nb/fFp2+TT7cv+U849lb6XXq40bWbNqz27M1fZNJEqDBUB8aOALChTceNC1kvjzyqOH+w2URa0VIpSqru9uxeU7FanNhPZ/KwJH2xN0L9r1L5SCvbTPbOp8XYaYc9DsfNVO5NNliWx0Vc2y3J8HbN9f4hgGH2PcpZQevb9IDL2cASM5tCuHHqnQw4FD2r8l9paaGt6qLbmj45SS+7XCeVrGAN5VGq52bJLHkVEsYm1mDjb4+gCNlg8GcSx4ZvaTXoGHeLQJ00WQtzbk71xqdjctuZk8oHj2/R/rrlg/ZrdKV9kf7PmpdEFJGUR8eJYQVODoBymhiubCHs2P39LFyh/e6AZa2qrMhPfj7IJCTccC6W82Ldta3lYWItd7eduNbr8ZmqvWW/8gdTVaIAdY="
     - stage: Debian packaging
       python: 2.7
       install:
diff --git a/alignak_module_ws/ws.py b/alignak_module_ws/ws.py
@@ -1800,59 +1800,6 @@ def do_loop_turn(self):
         logger.info("In loop")
         time.sleep(1)
 
-    def manage_signal2(self, sig, frame):  # pylint: disable=unused-argument
-        """Generic function to handle signals
-
-        Only called when the module process received SIGINT or SIGKILL.
-
-        Set interrupted attribute to True, self.process to None and returns
-
-        :param sig: signal sent
-        :type sig:
-        :param frame: frame before catching signal
-        :type frame:
-        :return: None
-        """
-        logger.warning("received a signal: %s", SIGNALS_TO_NAMES_DICT[sig])
-
-        if sig == signal.SIGHUP:
-            # if SIGHUP, reload configuration in arbiter
-            logger.info("Modules are not able to reload their configuration. "
-                        "Stopping the module...")
-
-        logger.info("Request to stop the module")
-        self.interrupted = True
-        # self.process = None
-
-    def set_signal_handler2(self, sigs=None):
-        """Set the signal handler to manage_signal (defined in this class)
-
-        Only set handlers for:
-        - signal.SIGTERM, signal.SIGINT
-        - signal.SIGUSR1, signal.SIGUSR2
-        - signal.SIGHUP
-
-        :return: None
-        """
-        exit(12)
-        logger.warning("set signal handler 2")
-        if sigs is None:
-            sigs = (signal.SIGTERM, signal.SIGINT, signal.SIGUSR1, signal.SIGUSR2, signal.SIGHUP)
-
-        func = self.manage_signal2
-        if os.name == "nt":  # pragma: no cover, no Windows implementation currently
-            try:
-                import win32api
-                win32api.SetConsoleCtrlHandler(func, True)
-            except ImportError:
-                version = ".".join([str(i) for i in os.sys.version_info[:2]])
-                raise Exception("pywin32 not installed for Python " + version)
-        else:
-            for sig in sigs:
-                signal.signal(sig, func)
-
-    set_exit_handler = set_signal_handler2
-
     def main(self):
         # pylint: disable=too-many-nested-blocks
         """Main loop of the process
@@ -1862,7 +1809,7 @@ def main(self):
         """
         # Set the OS process title
         self.set_proctitle(self.alias)
-        self.set_signal_handler2()
+        self.set_signal_handler()
 
         logger.info("starting...")
 
@@ -1902,6 +1849,7 @@ def main(self):
 
                 if not self.alignak_host:
                     # Do not check Alignak daemons...
+                    time.sleep(0.1)
                     continue
 
                 if ping_alignak_next_time < start:
@@ -1923,7 +1871,8 @@ def main(self):
                     get_daemons_next_time = start + self.alignak_daemons_polling_period
 
                     # Get Arbiter all states
-                    response = requests.get("http://%s:%s/get_all_states" %
+                    # todo: refactor this and use /system endpoint ?
+                    response = requests.get("http://%s:%s/satellites_configuration" %
                                             (self.alignak_host, self.alignak_port))
                     if response.status_code != 200:
                         continue
diff --git a/test/alignak_test.py b/test/alignak_test.py
@@ -826,6 +826,8 @@ def setup_with_file(self, configuration_file=None, env_file=None,
         with requests_mock.mock() as mr:
             for link in self._arbiter.dispatcher.all_daemons_links:
                 # mr.get('http://%s:%s/ping' % (link.address, link.port), json='pong')
+                mr.get('http://%s:%s/' % (link.address, link.port),
+                       json={"running_id": 123456.123456})
                 mr.get('http://%s:%s/identity' % (link.address, link.port),
                        json={"running_id": 123456.123456})
                 mr.get('http://%s:%s/_wait_new_conf' % (link.address, link.port), json=True)
diff --git a/test/test_module.py b/test/test_module.py
@@ -184,6 +184,7 @@ def test_module_loading(self):
         """
         self.setup_with_file('./cfg/cfg_default.cfg')
         self.assertTrue(self.conf_is_correct)
+        print("-----\n\n")
         self.show_configuration_logs()
 
         # No arbiter modules created
@@ -271,6 +272,8 @@ def test_module_manager(self):
 
         # Start external modules
         self.modulemanager.start_external_instances()
+        time.sleep(1.0)
+        print("My module PID: %s" % my_module.process.pid)
 
         # Starting external module logs
         self.assert_log_match("Trying to initialize module: web-services", 0)
@@ -292,14 +295,13 @@ def test_module_manager(self):
         index = 0
         self.assert_log_match("Killing external module", index)
         index = index +1
-        # self.assert_log_match("web-services is still living 10 seconds after a normal kill, I help it to die", 1)
         self.assert_log_match("External module killed", index)
         index = index +1
 
         # Should be dead (not normally stopped...) but we still know a process for this module!
         self.assertIsNotNone(my_module.process)
 
-        # Nothing special ...
+        # The module is dead but the modules manager do not know yet!
         self.modulemanager.check_alive_instances()
         self.assert_log_match("The external module web-services died unexpectedly!", index)
         index = index +1
@@ -341,17 +343,25 @@ def test_module_manager(self):
         # Clear logs
         self.clear_logs()
 
-        # Now we look for time restart so we kill it again
+        # Let the module start and then kill it again
+        time.sleep(3.0)
         my_module.kill()
+        # time.sleep(5.0)
+        self.show_logs()
+        print("My module PID 2: %s" % my_module.process.pid)
         time.sleep(0.2)
         self.assertFalse(my_module.process.is_alive())
         index = 0
         self.assert_log_match("Killing external module", index)
         index = index +1
+        # # todo: This log is not expected! But it is probably because of the py.test ...
+        # # Indeed the receiver daemon that the module is attached to is receiving a SIGTERM !!!
+        # self.assert_log_match(re.escape("'web-services' is still living 10 seconds after a normal kill, I help it to die"), index)
+        # index = index +1
         self.assert_log_match("External module killed", index)
         index = index +1
 
-        # Should be too early
+        # The module is dead but the modules manager do not know yet!
         self.modulemanager.check_alive_instances()
         self.assert_log_match("The external module web-services died unexpectedly!", index)
         index = index +1
@@ -385,6 +395,8 @@ def test_module_manager(self):
         index = index +1
         self.assert_log_match("web-services is now started", index)
         index = index +1
+        time.sleep(1.0)
+        print("My module PID: %s" % my_module.process.pid)
 
         # Clear logs
         self.clear_logs()
diff --git a/test/test_module_host.py b/test/test_module_host.py
@@ -637,12 +637,14 @@ def test_module_zzz_host(self):
         self.assertEqual(my_module.received_commands, 6)
 
         # Logout
+        print("Logout...")
         response = session.get(self.ws_endpoint + '/logout')
         self.assertEqual(response.status_code, 200)
         result = response.json()
         self.assertEqual(result['_status'], 'OK')
         self.assertEqual(result['_result'], 'Logged out')
 
+        time.sleep(1.0)
         self.modulemanager.stop_all()
 
     def test_module_zzz_simulate_host(self):
@@ -906,10 +908,12 @@ def test_module_zzz_host_timestamp(self):
             'alignak_host': '',
             'alignak_port': 7770,
         })
+        print("Module...")
 
         # Create a receiver daemon
         args = {'env_file': '', 'daemon_name': 'receiver-master'}
         self._receiver_daemon = Receiver(**args)
+        print("Daemon...")
 
         # Create the modules manager for the daemon
         self.modulemanager = ModulesManager(self._receiver_daemon)
@@ -936,8 +940,8 @@ def test_module_zzz_host_timestamp(self):
         # Check alive
         self.assertIsNotNone(my_module.process)
         self.assertTrue(my_module.process.is_alive())
-
-        time.sleep(1)
+        time.sleep(1.0)
+        print("My module PID: %s" % my_module.process.pid)
 
         # Do not allow GET request on /host - not authorized
         response = requests.get(self.ws_endpoint + '/host')
@@ -951,6 +955,7 @@ def test_module_zzz_host_timestamp(self):
         response = session.post(self.ws_endpoint + '/login', json=params, headers=headers)
         assert response.status_code == 200
         resp = response.json()
+        print("Login...")
 
         # You must have parameters when POSTing on /host
         headers = {'Content-Type': 'application/json'}
@@ -1426,13 +1431,15 @@ def test_module_zzz_host_timestamp(self):
         })
 
         # Logout
+        print("Logout...")
         response = session.get(self.ws_endpoint + '/logout')
         self.assertEqual(response.status_code, 200)
         result = response.json()
         self.assertEqual(result['_status'], 'OK')
         self.assertEqual(result['_result'], 'Logged out')
 
-        self.modulemanager.stop_all()
+        time.sleep(1.0)
+        # self.modulemanager.stop_all()
 
     def test_module_zzz_host_variables(self):
         """Test the module /host API * create/update custom variables
