[Neo-report] r2156 gregory - in /trunk/neo: client/app.py master/app.py storage/app.py

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Jun 11 10:00:22 CEST 2010


Author: gregory
Date: Fri Jun 11 10:00:13 2010
New Revision: 2156

Log:
Define main log() at application level for consistency.

Modified:
    trunk/neo/client/app.py
    trunk/neo/master/app.py
    trunk/neo/storage/app.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Fri Jun 11 10:00:13 2010
@@ -180,6 +180,12 @@ class Application(object):
         self._nm_release = lock.release
         self.compress = compress
 
+    def log(self):
+        self.em.log()
+        self.nm.log()
+        if self.pt is not None:
+            self.pt.log()
+
     @profiler_decorator
     def _handlePacket(self, conn, packet, handler=None):
         """

Modified: trunk/neo/master/app.py
==============================================================================
--- trunk/neo/master/app.py [iso-8859-1] (original)
+++ trunk/neo/master/app.py [iso-8859-1] Fri Jun 11 10:00:13 2010
@@ -95,15 +95,19 @@ class Application(object):
 
         registerLiveDebugger()
 
+    def log(self):
+        self.em.log()
+        self.nm.log()
+        self.tm.log()
+        if self.pt is not None:
+            self.pt.log()
+
     def run(self):
         try:
             self._run()
         except:
             logging.info('\nPre-mortem informations:')
-            self.em.log()
-            self.nm.log()
-            self.pt.log()
-            self.tm.log()
+            self.log()
             raise
 
     def _run(self):

Modified: trunk/neo/storage/app.py
==============================================================================
--- trunk/neo/storage/app.py [iso-8859-1] (original)
+++ trunk/neo/storage/app.py [iso-8859-1] Fri Jun 11 10:00:13 2010
@@ -87,6 +87,14 @@ class Application(object):
 
         registerLiveDebugger()
 
+    def log(self):
+        self.em.log()
+        self.logQueuedEvents()
+        self.nm.log()
+        self.tm.log()
+        if self.pt is not None:
+            self.pt.log()
+
     def loadConfiguration(self):
         """Load persistent configuration data from the database.
         If data is not present, generate it."""
@@ -149,12 +157,7 @@ class Application(object):
             self._run()
         except:
             logging.info('\nPre-mortem informations:')
-            self.em.log()
-            self.nm.log()
-            if self.pt is not None:
-                self.pt.log()
-            self.tm.log()
-            self.logQueuedEvents()
+            self.log()
             raise
 
     def _run(self):





More information about the Neo-report mailing list