Added missing timeout to V2 bakery script; in V1 and V2, timeout is n…

…ow 5s less than exec imterval. (closes #203)

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed 
+
+* Bakery (V2): Added missing `timeout` to async robotmk execution. `timeout` is now  
+set to 5 sec less than the execution interval so that the agent can kill the runner  
+before the next execution. (#203)
+
 ## 1.2.9 - 2022-03-25
 
 ### Fixed

bakery/v1/robotmk.py

@@ -61,11 +61,12 @@ def bake_robotmk(opsys, conf, conf_dir, plugins_dir):
         if opsys == "windows":
             # async mode in Windows: write configfile in INI-style, will be converted
             # during installation to YML
+            timeout = int(config.global_dict['cache_time']) - 5
             with Path(conf_dir, "check_mk.ini.plugins.robotmk-runner.py").open("w") as out:
                 out.write(u"    execution robotmk-runner.py = async\r\n")
                 out.write(u"    cache_age robotmk-runner.py = %d\r\n" % config.global_dict['execution_interval'])
                 # Kill the plugin before the next async execution will start
-                out.write(u"    timeout robotmk-runner.py = %d\r\n" % config.global_dict['cache_time'])
+                out.write(u"    timeout robotmk-runner.py = %d\r\n" % timeout)
                 out.write(u"\r\n")
                 plugins_dir_async = plugins_dir
         elif opsys == "linux":

bakery/v2/robotmk.py

@@ -190,7 +190,7 @@ def runner_plugin(self, opsys: OS) -> Plugin:
             return Plugin(
                 base_os=opsys,
                 source=Path('robotmk-runner.py'),
-                # TODO: interval=interval,
+                timeout=self.execution_interval - 5,
                 interval=self.execution_interval,
             )
         else: