[checkmk-commits] Removed defaults module usage from lib

Module: check_mk Branch: master Commit: f40b6e5e22b6b8dee1cc237acdb95b983ce0bb9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f40b6e5e22b6b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 16:07:38 2016 +0200 Removed defaults module usage from lib --- Makefile | 2 ++ lib/__init__.py | 2 ++ lib/crash_reporting.py | 10 +++++----- modules/check_mk_base.py | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8db40d2..3d50bbd 100644 --- a/Makefile +++ b/Makefile @@ -200,6 +200,7 @@ version: -o "$$(head -c 12 /etc/issue)" = "Ubuntu 14.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 15.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 15.10" \ + -o "$$(head -c 12 /etc/issue)" = "Ubuntu 16.04" \ -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" ] \ || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ @@ -209,6 +210,7 @@ setversion: sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkeventd bin/mkbackup ; \ + sed -i 's/^__version__ = ".*"$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion diff --git a/lib/__init__.py b/lib/__init__.py index 1a9ed1d..04a4dff 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -28,3 +28,5 @@ This library is currently handled as internal module of Check_MK and does not offer stable APIs. The code may change at any time.""" + +__version__ = "(inofficial)" diff --git a/lib/crash_reporting.py b/lib/crash_reporting.py index 7c5f651..df57533 100644 --- a/lib/crash_reporting.py +++ b/lib/crash_reporting.py @@ -30,6 +30,7 @@ developers for analyzing the crashes.""" import base64 import inspect +import os import pprint import sys import time @@ -40,6 +41,7 @@ try: except ImportError: import json +from . import __version__ # The default JSON encoder raises an exception when detecting unknown types. For the crash # reporting it is totally ok to have some string representations of the objects. @@ -61,12 +63,11 @@ def create_crash_info(crash_type, details = None): exc_type, exc_value, exc_traceback = sys.exc_info() - import defaults # TODO: defaults in lib? Clean this up! return { "crash_type" : crash_type, "time" : time.time(), "os" : get_os_info(), - "version" : defaults.check_mk_version, + "version" : __version__, "python_version": sys.version, "python_paths" : sys.path, "exc_type" : exc_type.__name__, @@ -78,9 +79,8 @@ def create_crash_info(crash_type, details = None): def get_os_info(): - import defaults # TODO: defaults in lib? Clean this up! - if defaults.omd_root: - return file(defaults.omd_root+"/share/omd/distro.info").readline().split("=", 1)[1].strip() + if "OMD_ROOT" in os.environ: + return file(os.environ["OMD_ROOT"]+"/share/omd/distro.info").readline().split("=", 1)[1].strip() elif os.path.exists("/etc/redhat-release"): return file("/etc/redhat-release").readline().strip() elif os.path.exists("/etc/SuSE-release"): diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 151bc16..81c89a3 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1595,7 +1595,7 @@ def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, d "inline_snmp" : is_inline_snmp_host(hostname), "manual_check" : is_manual_check(hostname, check_type, item), }) - file(crash_dir+"/crash.info", "w").write(crash_info_to_string(crash_info)+"\n") + file(crash_dir+"/crash.info", "w").write(crash_reporting.crash_info_to_string(crash_info)+"\n") def write_crash_dump_snmp_info(crash_dir, hostname, check_type):