Changeset 11a08b0 for fedd/fedd_util.py

Timestamp:

Oct 7, 2008 6:12:57 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

0ea11af

Parents:

8ecfbad

Message:

decent logging

File:

• fedd/fedd_util.py (modified) (2 diffs)

fedd/fedd_util.py

@@ -286 +286 @@
 
 
-def generate_fedid(subj, bits=2048, trace=None, dir=None):
+def generate_fedid(subj, bits=2048, log=None, dir=None, trace=None):
     """
     Create a new certificate and derive a fedid from it.
@@ -306 +306 @@
                     "-x509", "-days", "30", "-out", certpath]
 
-            if trace:
-                print >>trace, "calling %s" % " ".join(cmd)
-                call_out = trace
-            else:
-                call_out = open("/dev/null", "w")
-                
+            if log:
+                log.debug("[generate_fedid] %s" % " ".join(cmd))
+
+            if trace: call_out = trace
+            else: call_out = open("/dev/null", "w")
+
             rv = subprocess.call(cmd, stdout=call_out, stderr=call_out)
             if rv == 0: