[checkmk-commits] Cleaned up registration of SIGINT handler

Module: check_mk Branch: master Commit: 806c0c171a6fe8f33463cb52cb6338cd29ec43c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=806c0c171a6fe8… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Apr 4 16:21:23 2016 +0200 Cleaned up registration of SIGINT handler --- modules/check_mk.py | 5 +++++ modules/check_mk_base.py | 13 +++++++++++-- modules/nagios.py | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index db652bb..d8f16a9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4897,6 +4897,7 @@ def output_profile(): # | Main entry point and option parsing. Here is where all begins. | # '----------------------------------------------------------------------' +register_sigint_handler() load_checks() opt_nowiki = False @@ -5222,6 +5223,10 @@ try: output_profile() sys.exit(exit_status) +except MKTerminate, e: + # At top level this exception means the process has been terminated without issues. + sys.exit(0) + except (MKGeneralException, MKBailOut), e: sys.stderr.write("%s\n" % e) if opt_debug: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b09d8dc..89f3ff3 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -262,13 +262,19 @@ class MKSNMPError(Exception): class MKSkipCheck(Exception): pass -# This signal is raised when a previously configured timeout is reached. +# This exception is raised when a previously configured timeout is reached. # It is used during keepalive mode. It is also used by the automations # which have a timeout set. class MKTimeout(Exception): pass +# This exception is raises when the current Check_MK execution should be +# terminated. Currently it is raised by the SIGINT signal handler to propagate +# the termination up the callstack. +class MKTerminate(Exception): + pass + #. # .--Get data------------------------------------------------------------. @@ -2515,8 +2521,11 @@ def submit_check_mk_aggregation(hostname, status, output): # '----------------------------------------------------------------------' # register SIGINT handler for consistent CTRL+C handling +# TODO: use MKTermiante() signal instead and handle output and exit code in check_mk.py def interrupt_handler(signum, frame): sys.stderr.write('<Interrupted>\n') sys.exit(1) -signal.signal(signal.SIGINT, interrupt_handler) + +def register_sigint_handler(): + signal.signal(signal.SIGINT, interrupt_handler) diff --git a/modules/nagios.py b/modules/nagios.py index 2b152d1..debe7f1 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -986,6 +986,9 @@ if os.path.islink(%(dst)r): output.write(stripped_python_file(modules_dir + "/check_mk_base.py")) + # Register default Check_MK signal handler + output.write("register_sigint_handler()\n") + # TODO: can we avoid adding this module if no predictive monitoring # is being used? output.write(stripped_python_file(modules_dir + "/prediction.py"))