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

cdist/emulator.py

@@ -110,9 +110,12 @@ class Emulator(object):
         """Setup logging facility"""
 
         if '__cdist_loglevel' in self.env:
+            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])