[checkmk-commits] Check_MK Git: check_mk: made liveproxyd python <2.5 compatible ( For CentOS 5.x) support

Module: check_mk Branch: master Commit: 77b9d172685c0b491016d0daa3620be8f4ea6fd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77b9d172685c0b… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Feb 23 19:01:52 2015 +0100 made liveproxyd python <2.5 compatible (For CentOS 5.x) support --- doc/treasures/liveproxy/liveproxyd | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index da3ef48..165bca2 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -95,6 +95,9 @@ def liveproxyd_run(): dump_state() last_dump = now + except SystemExit: + # Python <2.5 compat: Simply let exit go through this level + raise except Exception, e: if opt_debug: raise @@ -926,7 +929,7 @@ def usage(): -v, --verbose Enable verbose output -g, --foreground Do not daemonize, run in foreground - -c, --conifg CONFIG Read configuration from file CONFIG + -c, --config CONFIG Read configuration from file CONFIG --debug Enable debug mode (let exceptions through) -h, --help Show this help and exit -V, --version Print version and exit @@ -1084,7 +1087,7 @@ try: opt_debug = True elif o in [ '-g', '--foreground' ]: opt_foreground = True - elif o in [ '-c', '--conifg' ]: + elif o in [ '-c', '--config' ]: opt_config = a # now handle action options @@ -1127,6 +1130,9 @@ try: os.remove(opt_pid_file) sys.exit(0) +except SystemExit: + # Python <2.5 compat: Simply let exit go through this level + raise except Exception, e: if opt_debug: raise