[Neo-report] r1812 gregory - in /trunk/neo: ./ admin/ client/ master/ storage/ tests/

[nobody at svn.erp5.org]

Author: gregory
Date: Mon Feb 22 12:41:31 2010
New Revision: 1812

Log:
Make the NodeManager a pseudo singleton object.

Modified:
    trunk/neo/admin/app.py
    trunk/neo/client/app.py
    trunk/neo/master/app.py
    trunk/neo/node.py
    trunk/neo/storage/app.py
    trunk/neo/tests/testNodes.py

Modified: trunk/neo/admin/app.py
==============================================================================
--- trunk/neo/admin/app.py [iso-8859-1] (original)
+++ trunk/neo/admin/app.py [iso-8859-1] Mon Feb 22 12:41:31 2010
@@ -57,7 +57,7 @@
 
         # Internal attributes.
         self.em = EventManager()
-        self.nm = NodeManager()
+        self.nm = NodeManager
 
         self.name = config.getCluster()
         self.server = config.getBind()

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Mon Feb 22 12:41:31 2010
@@ -108,7 +108,7 @@
         self.name = name
         self.connector_handler = getConnectorHandler(connector)
         self.dispatcher = Dispatcher()
-        self.nm = NodeManager()
+        self.nm = NodeManager
         self.cp = ConnectionPool(self)
         self.pt = None
         self.master_conn = None

Modified: trunk/neo/master/app.py
==============================================================================
--- trunk/neo/master/app.py [iso-8859-1] (original)
+++ trunk/neo/master/app.py [iso-8859-1] Mon Feb 22 12:41:31 2010
@@ -47,7 +47,7 @@
 
         # Internal attributes.
         self.em = EventManager()
-        self.nm = NodeManager()
+        self.nm = NodeManager
         self.tm = TransactionManager()
 
         self.name = config.getCluster()

Modified: trunk/neo/node.py
==============================================================================
--- trunk/neo/node.py [iso-8859-1] (original)
+++ trunk/neo/node.py [iso-8859-1] Mon Feb 22 12:41:31 2010
@@ -377,3 +377,5 @@
             logging.debug(' * %32s | %8s | %22s | %s' % (
                 uuid, node.getType(), address, node.getState()))
 
+# pseudo singleton
+NodeManager = NodeManager()

Modified: trunk/neo/storage/app.py
==============================================================================
--- trunk/neo/storage/app.py [iso-8859-1] (original)
+++ trunk/neo/storage/app.py [iso-8859-1] Mon Feb 22 12:41:31 2010
@@ -46,7 +46,7 @@
 
         # Internal attributes.
         self.em = EventManager()
-        self.nm = NodeManager()
+        self.nm = NodeManager
         self.tm = TransactionManager(self)
         self.dm = buildDatabaseManager(config.getAdapter(), config.getDatabase())
 

Modified: trunk/neo/tests/testNodes.py
==============================================================================
--- trunk/neo/tests/testNodes.py [iso-8859-1] (original)
+++ trunk/neo/tests/testNodes.py [iso-8859-1] Mon Feb 22 12:41:31 2010
@@ -125,7 +125,7 @@
 class NodeManagerTests(NeoTestBase):
 
     def setUp(self):
-        self.manager = nm = NodeManager()
+        self.manager = nm = NodeManager.__class__()
         self.storage = StorageNode(nm, ('127.0.0.1', 1000), self.getNewUUID())
         self.master = MasterNode(nm, ('127.0.0.1', 2000), self.getNewUUID())
         self.client = ClientNode(nm, None, self.getNewUUID())