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

8 years ago · b6467e716e
parent 75fe3272b3 87fe52ea61
commit b6467e716e
1 changed files with 5 additions and 2 deletions
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@ -110,9 +110,12 @@ class Emulator(object):
        """Setup logging facility"""

        if '__cdist_loglevel' in self.env:
-            level = int(self.env['__cdist_loglevel'])
+            try:
+                level = int(self.env['__cdist_loglevel'])
+            except:
+                level = logging.WARNING
        else:
-            level = logging.OFF
+            level = logging.WARNING
        logging.root.setLevel(level)

        self.log = logging.getLogger(self.target_host[0])