From dadecf9e22eda06686d2004311935f57059c8e44 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 12 Jan 2010 08:56:23 +0000
Subject: Don't mask real error when exiting before daemons ever started.

svn path=/rpkid/testbed.py; revision=2943
---
 rpkid/testbed.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'rpkid')

diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index 866ff1a1..a18bd61b 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -752,13 +752,16 @@ class allocation(object):
     Kill daemons for this entity.
     """
     rpki.log.info("Killing daemons for %s" % self.name)
-    for proc in (self.rpkid_process, self.irdbd_process):
-      try:
-        rpki.log.info("Killing pid %d" % proc.pid)
-        os.kill(proc.pid, signal.SIGTERM)
-      except OSError:
-        pass
-      proc.wait()
+    try:
+      for proc in (self.rpkid_process, self.irdbd_process):
+        try:
+          rpki.log.info("Killing pid %d" % proc.pid)
+          os.kill(proc.pid, signal.SIGTERM)
+        except OSError:
+          pass
+        proc.wait()
+    except AttributeError:
+      pass
 
   def call_rpkid(self, pdus, cb):
     """
-- 
cgit v1.2.3