Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop

This commit is contained in:
JHCD 2015-05-22 20:20:28 +02:00
commit 22db39efcf
3 changed files with 10 additions and 6 deletions

View file

@ -127,7 +127,7 @@ try:
for key,val in globals.config.items("BOSWatch"):
logging.debug(" - %s = %s", key, val)
except:
logging.debug("cannot read config file")
logging.exception("cannot read config file")
else:
#load plugins

View file

@ -5,15 +5,15 @@
# Use this as a simple Plugin Loading Tool to test your own Coded Plugins #
###########################################################################
import globals # Global variables
import pluginloader
import logging
import ConfigParser #for parse the config file
import os #for log mkdir
import time #timestamp for doublealarm
from includes import globals # Global variables
from includes import pluginloader
#create new logger
logger = logging.getLogger()
logger.setLevel(logging.DEBUG)
@ -46,7 +46,7 @@ try:
for key,val in globals.config.items("Plugins"):
logging.debug(" - %s = %s", key, val)
except:
logging.debug("cannot read config file")
logging.exception("cannot read config file")
try:
@ -86,4 +86,4 @@ while True:
exit()
except:
logging.exception("unknown error")
exit()
exit()

View file

@ -66,6 +66,10 @@ def run(typ,freq,data):
logging.exception("no HTTP request been sended")
except: #otherwise
logging.exception("cannot get HTTP response")
finally:
logging.debug("close http-Connection")
httprequest.close()
########## User Plugin CODE ##########
except: