cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [42/50] [abbrv] git commit: updated refs/heads/marvin_refactor to b784012
Date Mon, 18 Nov 2013 08:50:49 GMT
marvin_refactor: prepending marvin. to all logs

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26b40257
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26b40257
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26b40257

Branch: refs/heads/marvin_refactor
Commit: 26b4025761163dbe3c20b35c43a35c9d3078d932
Parents: 8cd58a7
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Oct 2 19:44:42 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Oct 31 13:54:26 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/TestCaseExecuteEngine.py | 4 ++--
 tools/marvin/marvin/cloudstackConnection.py  | 2 ++
 tools/marvin/marvin/marvinPlugin.py          | 6 +++---
 tools/marvin/marvin/remoteSSHClient.py       | 2 +-
 tools/marvin/marvin/util.py                  | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26b40257/tools/marvin/marvin/TestCaseExecuteEngine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/TestCaseExecuteEngine.py b/tools/marvin/marvin/TestCaseExecuteEngine.py
index c9796b8..1af9e34 100644
--- a/tools/marvin/marvin/TestCaseExecuteEngine.py
+++ b/tools/marvin/marvin/TestCaseExecuteEngine.py
@@ -48,7 +48,7 @@ class TestCaseExecuteEngine(object):
 
         if testcaseLogFile is not None:
             self.logfile = testcaseLogFile
-            self.logger = logging.getLogger("TestCaseExecuteEngine")
+            self.logger = logging.getLogger("marvin.TestCaseExecuteEngine")
             fh = logging.FileHandler(self.logfile)
             fh.setFormatter(self.logformat)
             self.logger.addHandler(fh)
@@ -81,7 +81,7 @@ class TestCaseExecuteEngine(object):
                 self.injectTestCase(test)
             else:
                 #logger bears the name of the test class
-                testcaselogger = logging.getLogger("%s" % (test))
+                testcaselogger = logging.getLogger("marvin.%s" % (test))
                 fh = logging.FileHandler(self.logfile)
                 fh.setFormatter(self.logformat)
                 testcaselogger.addHandler(fh)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26b40257/tools/marvin/marvin/cloudstackConnection.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py
index 20afac9..8c6c9cf 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -77,6 +77,8 @@ class CloudConnection(object):
         """
         requests_log = logging.getLogger("requests")
         requests_log.setLevel(lvl)
+        factory_log = logging.getLogger("factory")
+        factory_log.setLevel(lvl)
 
     def poll(self, jobid, response):
         """

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26b40257/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 716de25..716ca90 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -48,7 +48,7 @@ class MarvinPlugin(Plugin):
                                            "%(name)s - %(message)s")
 
         if options.debug_log:
-            self.logger = logging.getLogger("NoseTestExecuteEngine")
+            self.logger = logging.getLogger("marvin.NoseTestExecuteEngine")
             self.debug_stream = logging.FileHandler(options.debug_log)
             self.debug_stream.setFormatter(self.logformat)
             self.logger.addHandler(self.debug_stream)
@@ -99,7 +99,7 @@ class MarvinPlugin(Plugin):
         Plugin.options(self, parser, env)
 
     def __init__(self):
-        self.identifier = None
+        self.identifier = ''
         Plugin.__init__(self)
 
     def prepareTestRunner(self, runner):
@@ -128,7 +128,7 @@ class MarvinPlugin(Plugin):
     def beforeTest(self, test):
         self.testName = test.__str__().split()[0]
         self.testclient.identifier = '-'.join([self.identifier, self.testName])
-        self.logger.name = test.__str__()
+        self.logger.name = "marvin.%s" % test.__str__()
 
     def startTest(self, test):
         """

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26b40257/tools/marvin/marvin/remoteSSHClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/remoteSSHClient.py b/tools/marvin/marvin/remoteSSHClient.py
index d64c82d..502fe46 100644
--- a/tools/marvin/marvin/remoteSSHClient.py
+++ b/tools/marvin/marvin/remoteSSHClient.py
@@ -32,7 +32,7 @@ class remoteSSHClient(object):
         self.keyPairFile = keyPairFileLocation
         self.ssh = paramiko.SSHClient()
         self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-        self.logger = logging.getLogger('sshClient')
+        self.logger = logging.getLogger('marvin.sshClient')
         ch = logging.StreamHandler()
         ch.setLevel(log_lvl)
         self.logger.addHandler(ch)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26b40257/tools/marvin/marvin/util.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/util.py b/tools/marvin/marvin/util.py
index 93cb56b..175a851 100644
--- a/tools/marvin/marvin/util.py
+++ b/tools/marvin/marvin/util.py
@@ -202,7 +202,7 @@ def fetch_api_client(config_file='datacenterCfg'):
     """Fetch the Cloudstack API Client"""
     config = marvin.configGenerator.get_setup_config(config_file)
     mgt = config.mgtSvr[0]
-    testClientLogger = logging.getLogger("testClient")
+    testClientLogger = logging.getLogger("marvin.testClient")
     asyncTimeout = 3600
     return cloudstackAPIClient.CloudStackAPIClient(
         marvin.cloudstackConnection.cloudConnection(


Mime
View raw message