Merge remote-tracking branch 'ungleich/master' into jobs-locking

This commit is contained in:
Darko Poljak 2017-08-13 12:27:57 +02:00
commit b6467e716e

View file

@ -110,9 +110,12 @@ class Emulator(object):
"""Setup logging facility""" """Setup logging facility"""
if '__cdist_loglevel' in self.env: if '__cdist_loglevel' in self.env:
try:
level = int(self.env['__cdist_loglevel']) level = int(self.env['__cdist_loglevel'])
except:
level = logging.WARNING
else: else:
level = logging.OFF level = logging.WARNING
logging.root.setLevel(level) logging.root.setLevel(level)
self.log = logging.getLogger(self.target_host[0]) self.log = logging.getLogger(self.target_host[0])