Module: check_mk
Branch: master
Commit: 381766192dda669cb01e5f8290228a26cc693dc8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=381766192dda66…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 18 11:35:41 2014 +0100
simple code cleanup
---
modules/check_mk.py | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index c608f2b..e13e6cf 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -5983,7 +5983,7 @@ def read_autochecks_of(hostname, world="config"):
autochecks.append( (ct, it, compute_check_parameters(hostname, ct, it, par)) )
return autochecks
-# Read autochecks, but do not compute final check parameters,
+# Read autochecks, but do not compute final check parameters,
# also return a forth column with the raw string of the parameters.
def parse_autochecks_file(hostname):
def split_python_tuple(line):
@@ -6086,6 +6086,8 @@ def output_profile():
# | Main entry point and option parsing. Here is where all begins. |
# '----------------------------------------------------------------------'
+load_checks()
+
opt_nowiki = False
opt_split_rrds = False
@@ -6107,19 +6109,12 @@ non_config_options = ['-L', '--list-checks',
'-P', '--package', '-M', '--notify'
'--man', '-V', '--version' ,'-h',
'--help', '--automation',
'--create-rrd', '--convert-rrds',
'--keepalive' ]
-non_checks_options = ['--create-rrd', '--convert-rrds',
'--help']
-
try:
opts, args = getopt.getopt(sys.argv[1:], short_options, long_options)
except getopt.GetoptError, err:
print str(err)
sys.exit(1)
-# The check files set serveral config vars which might be overwritten
-# later by configuration. So the checks need to be loaded before the config
-if len(set.intersection(set(non_checks_options), [o[0] for o in opts])) == 0:
- load_checks()
-
# Read the configuration files (main.mk, autochecks, etc.), but not for
# certain operation modes that does not need them and should not be harmed
# by a broken configuration
@@ -6378,7 +6373,7 @@ if not done:
except:
print "Cannot resolve hostname '%s'." % hostname
sys.exit(2)
-
+
exit_status = do_check(hostname, ipaddress, check_types)
output_profile()