Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-20 07:10:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace passwords and apikeys with "***" in logging #69

Browse source
This commit is contained in:
JHCD 2015-07-27 20:55:50 +02:00
parent 6520edea4c
commit f95a270177
3 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
boswatch.py
View file

@ -29,6 +29,7 @@ from includes import MyTimedRotatingFileHandler # extension of TimedRotatingFil
from includes import converter # converter functions
from includes import signalHandler # TERM-Handler for use script as a daemon
from includes import checkSubprocesses # check startup of the subprocesses
from includes.helper import configHandler
#
@ -206,18 +207,10 @@ try:
globals.config.read(globals.script_path+"/config/config.ini")
# if given loglevel is debug:
if globals.config.getint("BOSWatch","loglevel") == 10:
logging.debug(" - BOSWatch:")
for key,val in globals.config.items("BOSWatch"):
logging.debug(" -- %s = %s", key, val)
logging.debug(" - FMS:")
for key,val in globals.config.items("FMS"):
logging.debug(" -- %s = %s", key, val)
logging.debug(" - ZVEI:")
for key,val in globals.config.items("ZVEI"):
logging.debug(" -- %s = %s", key, val)
logging.debug(" - POC:")
for key,val in globals.config.items("POC"):
logging.debug(" -- %s = %s", key, val)
configHandler.checkConfig("BOSWatch")
configHandler.checkConfig("FMS")
configHandler.checkConfig("ZVEI")
configHandler.checkConfig("POC")
except:
# we couldn't work without config -> exit
logging.critical("cannot read config file")
@ -244,11 +237,7 @@ try:
# Add NMA logging handler
#
try:
if globals.config.has_section("NMAHandler"):
if globals.config.getint("BOSWatch","loglevel") == 10:
logging.debug(" - NMAHandler:")
for key,val in globals.config.items("NMAHandler"):
logging.debug(" -- %s = %s", key, val)
if configHandler.checkConfig("NMAHandler"):
# is NMAHandler enabled?
if globals.config.getboolean("NMAHandler", "enableHandler") == True:
# we only could do something, if an APIKey is given:

4
includes/globals.py
View file

@ -31,6 +31,6 @@ ricDescribtionList = {}
# function -> read only in script
def getVers(mode="vers"):
if mode == "vers":
return "2.0"
return "2.1-dev"
elif mode == "date":
return " 2015/07/13"
return "2015/07/27"

2
includes/helper/configHandler.py
View file

@ -28,6 +28,8 @@ def checkConfig(section=""):
logging.debug("read [%s] from config file", section)
for key,val in globals.config.items(section):
if ("password" in key) or ("apikey" in key):
val = "***"
logging.debug(" - %s = %s", key, val)
return True