aboutsummaryrefslogtreecommitdiff
path: root/scripts/testbed.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2008-01-23 06:45:44 +0000
committerRob Austein <sra@hactrn.net>2008-01-23 06:45:44 +0000
commit1bb3a5436de0c80be892a1861b90c47234adc2b3 (patch)
treec2da6fe1ca3a272184df1497aa07c1ad3aa8dea0 /scripts/testbed.py
parentba64d91f449299048be6658faf65836dc7996578 (diff)
Cleanup
svn path=/scripts/testbed.py; revision=1492
Diffstat (limited to 'scripts/testbed.py')
-rw-r--r--scripts/testbed.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/testbed.py b/scripts/testbed.py
index b0e6535b..e74eda5f 100644
--- a/scripts/testbed.py
+++ b/scripts/testbed.py
@@ -259,9 +259,9 @@ def main():
try:
for a in db.engines:
a.kill_daemons()
- for p in (rootd_process, rsyncd_process):
+ for p,n in ((rootd_process, "rootd"), (rsyncd_process, "rsyncd")):
if p is not None:
- rpki.log.info("Killing process %d" % p.pid)
+ rpki.log.info("Killing %n[%d]" % (n, p.pid))
os.kill(p.pid, signal.SIGTERM)
except Exception, data:
rpki.log.warn("Couldn't clean up daemons (%s), continuing" % data)