working towards 1.1.4 release

oisinmulvihill · Dec 21, 2011 · 5013af0 · 5013af0
1 parent 545f698
commit 5013af0
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 621 deletions.
diff --git a/lib/evasion/agency/agent.py b/lib/evasion/agency/agent.py
@@ -23,7 +23,8 @@
 class Base(object):
     """Base class agent entry.
     """
-    _log = logging.getLogger("evasion.agency.agent.Base")
+    def __init__(self):
+        self.log = logging.getLogger("evasion.agency.agent.Base")
 
 
     def setUp(self, config):

diff --git a/lib/evasion/agency/agents/testing/fake.py b/lib/evasion/agency/agents/testing/fake.py
@@ -14,6 +14,8 @@
 
 
 """
+import logging
+
 from evasion.agency import agent
 
 
@@ -34,6 +36,7 @@ class Agent(agent.Base):
 
     """
     def __init__(self):
+        self.log = logging.getLogger("evasion.agency.agents.testing.fake.Agent")
         self.config = None
         self._parent = None
 

diff --git a/lib/evasion/agency/docs/__init__.py b/lib/evasion/agency/docs/__init__.py
diff --git a/lib/evasion/agency/docs/agency.stx b/lib/evasion/agency/docs/agency.stx
diff --git a/lib/evasion/agency/manager.py b/lib/evasion/agency/manager.py
@@ -171,6 +171,8 @@ def setUp(self):
                 continue
             try:
                 a.mod.setUp(a.config)
+            except (SystemExit, KeyboardInterrupt):
+                raise
             except:
                 self.log.exception("%s setUp error: " % a)
                 sys.stderr.write("%s setUp error: %s" % (a, self.formatError()))
@@ -196,6 +198,8 @@ def tearDown(self):
                 continue
             try:
                 a.mod.tearDown()
+            except (SystemExit, KeyboardInterrupt):
+                raise
             except:
                 self.log.exception("%s tearDown error: " % a)
                 sys.stderr.write("%s tearDown error: %s" % (a, self.formatError()))
@@ -218,6 +222,8 @@ def start(self):
                 continue
             try:
                 a.mod.start()
+            except (SystemExit, KeyboardInterrupt):
+                raise
             except:
                 self.log.exception("%s start error: " % a)
                 sys.stderr.write("%s start error: %s" % (a, self.formatError()))
@@ -240,6 +246,8 @@ def stop(self):
                 continue
             try:
                 a.mod.stop()
+            except (SystemExit, KeyboardInterrupt):
+                raise
             except:
                 self.log.exception("%s stop error: " % a)
                 sys.stderr.write("%s stop error: %s" % (a, self.formatError()))
diff --git a/lib/evasion/agency/scripts/__init__.py b/lib/evasion/agency/scripts/__init__.py
diff --git a/lib/evasion/agency/scripts/manager.py b/lib/evasion/agency/scripts/manager.py
diff --git a/lib/evasion/agency/templatecfg/__init__.py b/lib/evasion/agency/templatecfg/__init__.py
diff --git a/lib/evasion/agency/templatecfg/devices.cfg.in b/lib/evasion/agency/templatecfg/devices.cfg.in
diff --git a/lib/evasion/agency/templatecfg/log.cfg.in b/lib/evasion/agency/templatecfg/log.cfg.in
diff --git a/lib/evasion/agency/templatecfg/manager.cfg.in b/lib/evasion/agency/templatecfg/manager.cfg.in