diff options
author | Rob Austein <sra@hactrn.net> | 2010-01-12 09:16:16 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2010-01-12 09:16:16 +0000 |
commit | c86c7979e530cf0a09a1b2d4b3b606b74c7f2b8d (patch) | |
tree | abaffef5b06135d62df6ecd67a8951a96e9730b4 | |
parent | dadecf9e22eda06686d2004311935f57059c8e44 (diff) |
testbed and yamltest should always log to stderr
svn path=/myrpki/yamltest.py; revision=2944
-rw-r--r-- | myrpki/yamltest.py | 5 | ||||
-rw-r--r-- | rpkid/testbed.py | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/myrpki/yamltest.py b/myrpki/yamltest.py index 8b2a8378..6c4f83da 100644 --- a/myrpki/yamltest.py +++ b/myrpki/yamltest.py @@ -46,7 +46,7 @@ PERFORMANCE OF THIS SOFTWARE. """ import subprocess, csv, re, os, getopt, sys, base64, yaml, signal, errno, time -import rpki.resource_set, rpki.sundial, rpki.config, myrpki +import rpki.resource_set, rpki.sundial, rpki.config, rpki.log, myrpki # Nasty regular expressions for parsing config files. Sadly, while # the Python ConfigParser supports writing config files, it does so in @@ -558,6 +558,9 @@ for o, a in opts: if len(argv) > 1: raise RuntimeError, "Unexpected arguments %r" % argv +rpki.log.use_syslog = False +rpki.log.init("yamltest") + yaml_file = argv[0] if argv else "../rpkid/testbed.1.yaml" # Allow optional config file for this tool to override default diff --git a/rpkid/testbed.py b/rpkid/testbed.py index a18bd61b..0f5b9214 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -162,6 +162,7 @@ def main(): Main program. """ + rpki.log.use_syslog = False rpki.log.init(testbed_name) rpki.log.info("Starting") |