diff options
| author | Rob Austein <sra@hactrn.net> | 2008-01-23 19:39:57 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2008-01-23 19:39:57 +0000 |
| commit | 7b0dc65c57f58475111d3c30255b199026e4cdc0 (patch) | |
| tree | e450b2797e414b7d8c64b46bd2b5769eaaa905c5 /scripts | |
| parent | 86b87c78f6b5a05a003f20c6f13ddbd70041fe0e (diff) | |
Cleanup
svn path=/scripts/testbed.py; revision=1495
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/testbed.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/testbed.py b/scripts/testbed.py index cfa724da..606473b1 100644 --- a/scripts/testbed.py +++ b/scripts/testbed.py @@ -106,7 +106,7 @@ prog_openssl = cfg.get("prog_openssl", "../../openssl/openssl/apps/openssl") prog_rsyncd = cfg.get("prog_rsyncd", "rsync") prog_rcynic = cfg.get("prog_rcynic", "../../rcynic/rcynic") -rcynic_stats = cfg.get("rcynic_stats", "xsltproc ../../rcynic/rcynic.xsl %s.xml | w3m -T text/html -dump" % rcynic_name) +rcynic_stats = cfg.get("rcynic_stats", "xsltproc ../../rcynic/rcynic.xsl %s.xml | w3m -T text/html -dump | awk 'NR > 1'" % rcynic_name) rpki_sql_file = cfg.get("rpki_sql_file", "../docs/rpki-db-schema.sql") irdb_sql_file = cfg.get("irdb_sql_file", "../docs/sample-irdb.sql") @@ -261,7 +261,7 @@ def main(): a.kill_daemons() for p,n in ((rootd_process, "rootd"), (rsyncd_process, "rsyncd")): if p is not None: - rpki.log.info("Killing %n[%d]" % (n, p.pid)) + rpki.log.info("Killing %s" % n) os.kill(p.pid, signal.SIGTERM) except Exception, data: rpki.log.warning("Couldn't clean up daemons (%s), continuing" % data) @@ -693,8 +693,10 @@ def setup_publication(): def run_rcynic(): """Run rcynic to see whether what was published makes sense.""" rpki.log.info("Running rcynic") - subprocess.check_call((prog_rcynic, "-c", rcynic_name + ".conf")) - subprocess.call(rcynic_stats, shell = True) + env = os.environ.copy() + env["TZ"] = "" + subprocess.check_call((prog_rcynic, "-c", rcynic_name + ".conf"), env = env) + subprocess.call(rcynic_stats, shell = True, env = env) biz_cert_fmt_1 = '''\ [ req ] |