Changeset 1094

Timestamp:

Sep 21, 2012, 11:47:40 AM (12 years ago)

Author:

joergs

Message:

cleanup output

File:

• opsi/products/opsi-bacula-server-conf.py (modified) (2 diffs)

opsi/products/opsi-bacula-server-conf.py

@@ -3 +3 @@
 # get client properties for bacula
 
+import logging
 import subprocess
 import json
@@ -79 +80 @@
 #
 
+#logging.basicConfig(format='%(asctime)s %(levelname)8s %(message)s')
+logging.basicConfig(format='%(message)s')
+logger = logging.getLogger(__name__)
+#logger.setLevel(logging.INFO)
+logger.setLevel(logging.DEBUG)
+
+logger.debug( "start" )
+
 try:
     clientsWithBacula=json.loads( subprocess.check_output( opsiCallPrefix + opsiCallClientsWithBacula ) )
-except subprocess.CalledProcessError:
-    print "failed"
-    exit( 1 )
+#except subprocess.CalledProcessError as e:
+except e:
+    logger.exception( "%s: failed:" %(clientId) )
+    exit(1)
 
-pprint( clientsWithBacula )
+#pprint( clientsWithBacula )
         
 for client in clientsWithBacula:
     clientId = client['clientId']
-    print clientId
     
     try:
         clientBaculaProperties=json.loads( subprocess.check_output( opsiCallPrefix + opsiCallClientBaculaProperties + [ client['clientId'] ] ) )
-    except subprocess.CalledProcessError:
-        print "failed"
-        exit( 1 )
-        
-    pprint( clientBaculaProperties )
-    write_client_conf( client, clientBaculaProperties )
-    write_job_conf( client, clientBaculaProperties )
+    except ValueError as e:
+        logger.warn( "%s: no valid information found: %s" %(clientId, e) )
+    except subprocess.CalledProcessError as e:
+        logger.exception( "%s: failed:" %(clientId) )
+        #exit( 1 )
+    else:            
+        #pprint( clientBaculaProperties )
+        write_client_conf( client, clientBaculaProperties )
+        write_job_conf( client, clientBaculaProperties )
+        logger.info( "%s: OK" % clientId )
+
+logger.debug( "finished" )