fixes #2595

retry multiple times on `intelmqctl stop` to check if bots really
stopped, since the bots might take longer to stop.
Using retry in constrast to increasing the sleep_time keeps the delay
short in case the bots did already stop.

Author: Lukas-Heindl

intelmq/bin/intelmqctl.py

@@ -563,12 +563,36 @@ def botnet_stop(self, group=None):
         for bot_id in bots:
             self.bot_stop(bot_id, getstatus=False)
 
-        retval = 0
-        time.sleep(0.75)
-        for bot_id in bots:
-            botnet_status[bot_id] = self.bot_status(bot_id)[1]
-            if botnet_status[bot_id] not in ['stopped', 'disabled']:
-                retval = 1
+        # shallow copy of the list suffices
+        # only aliasing the list to ease reading the following
+        stopped_but_still_running_bots = bots
+
+        # parameters:
+        # - sleep 0.75 s with an increment of 0.1
+        # - at most 5 tries
+        # => sleep-ing at most 4.75 seconds
+        sleep_time = 0.75 # in seconds
+        for _ in range(5):
+            # give the bots some time to terminate
+            time.sleep(sleep_time)
+            # update the botnet_status
+            for bot_id in stopped_but_still_running_bots:
+                botnet_status[bot_id] = self.bot_status(bot_id)[1]
+                if botnet_status[bot_id] in ['stopped', 'disabled']:
+                    stopped_but_still_running_bots.remove(bot_id)
+
+            # check if all bots are stopped -> no need to wait further
+            if len(stopped_but_still_running_bots) == 0:
+                break
+            # the longer the bots need to terminate the longer we wait to check
+            # again to avoid long-term load on the system
+            # but stop at 5 seconds to avoid waiting too long until rechecking
+            # the status
+            sleep_time = min(5, sleep_time+0.1)
+
+        retval = 1
+        if len(stopped_but_still_running_bots) == 0:
+            retval = 0
 
         self.log_botnet_message('stopped', group)
         return retval, botnet_status