nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 08:02:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

make logging python3 compatible

Browse Source
This commit is contained in:
Clint Armstrong
2015-08-25 11:35:22 -04:00
parent 71c1771d84
commit 73ada34f30
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
poller-service.py
+6 -7
View File
@@ -44,7 +44,7 @@ def get_config_data():
except:
log.critical("ERROR: Could not execute: %s" % config_cmd)
sys.exit(2)
return proc.communicate()[0]
return proc.communicate()[0].decode()
try:
with open(config_file) as f:
@@ -60,13 +60,12 @@ except:
sys.exit(2)
try:
loglevel = logging.getLevelName(config['poller_service_loglevel'].upper())
log.setLevel(config['poller_service_loglevel'].upper())
except KeyError:
loglevel = logging.getLevelName('INFO')
if not isinstance(loglevel, int):
log.warning('ERROR: {0} is not a valid log level'.format(str(loglevel)))
loglevel = logging.getLevelName('INFO')
log.setLevel(loglevel)
log.setLevel('INFO')
except ValueError:
log.warning('ERROR: {0} is not a valid log level'.format(config['poller_service_loglevel']))
log.setLevel('INFO')
poller_path = config['install_dir'] + '/poller.php'
discover_path = config['install_dir'] + '/discovery.php'