aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2007-12-17 16:59:01 +0000
committerRob Austein <sra@hactrn.net>2007-12-17 16:59:01 +0000
commit57a15624f75cc2c7d683a5ed2d8ca457bd54a8e2 (patch)
tree25f50fbb4a76048cbc61f71c4a1e8bdb80403a11 /scripts
parent3b29e24d5564ba2f47b5f56730e918c327f707cf (diff)
Logging cleanup after debugging CMS problem
svn path=/scripts/rpki/cms.py; revision=1382
Diffstat (limited to 'scripts')
-rw-r--r--scripts/rpki/cms.py9
-rw-r--r--scripts/rpki/log.py2
2 files changed, 3 insertions, 8 deletions
diff --git a/scripts/rpki/cms.py b/scripts/rpki/cms.py
index 42df4d68..da6a0837 100644
--- a/scripts/rpki/cms.py
+++ b/scripts/rpki/cms.py
@@ -73,8 +73,6 @@ def sign(plaintext, keypair, certs):
"-in", plaintext_filename,
"-out", signed_filename)
- rpki.log.debug("CMS signing command: %s" % str(cmd))
-
rpki.log.trace()
pid = os.fork()
@@ -103,11 +101,8 @@ def sign(plaintext, keypair, certs):
rpki.log.trace()
- os.unlink(key_filename)
- os.unlink(signer_filename)
- os.unlink(certfile_filename)
- os.unlink(plaintext_filename)
- os.unlink(signed_filename)
+ for f in (key_filename, signer_filename, certfile_filename, plaintext_filename, signed_filename):
+ os.unlink(f)
rpki.log.trace()
diff --git a/scripts/rpki/log.py b/scripts/rpki/log.py
index f8a0844b..e7b95a63 100644
--- a/scripts/rpki/log.py
+++ b/scripts/rpki/log.py
@@ -27,7 +27,7 @@ notice = logger(syslog.LOG_NOTICE)
info = logger(syslog.LOG_INFO)
debug = logger(syslog.LOG_DEBUG)
-enable_trace = True
+enable_trace = False
def trace():
"""Execution trace -- where are we now, and whence came we here?"""