Merge branch 'develop' into ping

This commit is contained in:
Bastian Schroll 2018-09-21 12:50:08 +02:00 committed by GitHub
commit 11dab44098
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 14 deletions

View file

@ -17,13 +17,23 @@
import logging
import os
import sys
import platform
logging.debug("- %s loaded", __name__)
# todo searching for root part is not a nice solution atm
# note searching for root part is not a nice solution atm
ROOT_PATH = os.path.dirname(sys.modules['boswatch'].__file__).replace("\\", "/") + "/../"
LOG_PATH = ROOT_PATH + "log/"
CONFIG_PATH = ROOT_PATH + "config/"
# implements a system adaption for the paths
if platform.system() == "Linux":
LOG_PATH = "/var/log/boswatch/"
CONFIG_PATH = "/etc/opt/boswatch/"
else:
# FIXME LOG_PATH not used actually
# path is fixed in logger config.ini
LOG_PATH = ROOT_PATH + "log/"
CONFIG_PATH = ROOT_PATH + "config/"
PLUGIN_PATH = ROOT_PATH + "plugins/"
CSV_PATH = ROOT_PATH + "csv/"
BIN_PATH = ROOT_PATH + "_bin/"

View file

@ -13,7 +13,6 @@
@date: 15.01.2018
@author: Bastian Schroll
@description: Little Helper to replace wildcards in stings
@todo not completed yet
"""
import logging
import time