[Neo-report] r2679 jm - in /trunk/neo/admin: app.py handler.py

[nobody at svn.erp5.org]

Author: jm
Date: Tue Mar 22 11:26:59 2011
New Revision: 2679

Log:
admin: factorize code (re)initializing application

Modified:
    trunk/neo/admin/app.py
    trunk/neo/admin/handler.py

Modified: trunk/neo/admin/app.py
==============================================================================
--- trunk/neo/admin/app.py [iso-8859-1] (original)
+++ trunk/neo/admin/app.py [iso-8859-1] Tue Mar 22 11:26:59 2011
@@ -76,9 +76,12 @@ class Application(object):
         self.master_event_handler = MasterEventHandler(self)
         self.dispatcher = Dispatcher()
         self.cluster_state = None
+        self.reset()
+        registerLiveDebugger(on_log=self.log)
+
+    def reset(self):
         self.master_conn = None
         self.master_node = None
-        registerLiveDebugger(on_log=self.log)
 
     def log(self):
         self.em.log()

Modified: trunk/neo/admin/handler.py
==============================================================================
--- trunk/neo/admin/handler.py [iso-8859-1] (original)
+++ trunk/neo/admin/handler.py [iso-8859-1] Tue Mar 22 11:26:59 2011
@@ -115,8 +115,7 @@ class MasterEventHandler(EventHandler):
         app = self.app
         assert app.master_conn in (conn, None)
         app.dispatcher.clear()
-        app.master_conn = None
-        app.master_node = None
+        app.reset()
         app.uuid = None
         raise PrimaryFailure