[checkmk-commits] Check_MK Git: check_mk: FIX FIX: Fixed appending of --keepalive-fd parameters to checkhelps

Module: check_mk Branch: master Commit: 43e61a3509ce2508aae0a4dac4428e5128f6026e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43e61a3509ce25… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 2 10:37:51 2014 +0200 FIX FIX: Fixed appending of --keepalive-fd parameters to checkhelps through a bug in check_mk.py, every reload another dublicate --keepalive-fd parameters was added to the commandline. --- .werks/174 | 8 ++++++++ ChangeLog | 1 + modules/check_mk.py | 1 + 3 files changed, 10 insertions(+) diff --git a/.werks/174 b/.werks/174 new file mode 100644 index 0000000..cc80b9a --- /dev/null +++ b/.werks/174 @@ -0,0 +1,8 @@ +Title: FIX: Fixed appending of --keepalive-fd parameters to checkhelps +Level: 1 +Component: core +Version: 1.2.5i5 +Date: 1404290005 +Class: fix + +through a bug in check_mk.py, every reload another dublicate --keepalive-fd parameters was added to the commandline. diff --git a/ChangeLog b/ChangeLog index b136ceb..2751cd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 1012 Fix quoting of backslashes in custom checks with nagios core... NOTE: Please refer to the migration notes! * 1035 FIX: Do not fail on errors in *.mk files anymore - except in interactive mode... + * 0174 FIX: FIX: Fixed appending of --keepalive-fd parameters to checkhelps... Checks & Agents: * 0168 f5_bigip_pool: Added Wato configuration... diff --git a/modules/check_mk.py b/modules/check_mk.py index 9e943f5..5f97bbc 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5455,6 +5455,7 @@ def do_check_keepalive(): break hostname = hostname.strip() if hostname == "*": + sys.argv = [ x for x in sys.argv if not x.startswith('--keepalive-fd=') ] os.execvp("cmk", sys.argv + [ "--keepalive-fd=%d" % keepalive_fd ]) elif not hostname: break