Make the NodeManager a pseudo singleton object.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1812 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/admin/app.py

@@ -57,7 +57,7 @@ class Application(object):
 
         # Internal attributes.
         self.em = EventManager()
-        self.nm = NodeManager()
+        self.nm = NodeManager
 
         self.name = config.getCluster()
         self.server = config.getBind()

neo/client/app.py

@@ -108,7 +108,7 @@ class Application(object):
         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

neo/master/app.py

@@ -47,7 +47,7 @@ class Application(object):
 
         # Internal attributes.
         self.em = EventManager()
-        self.nm = NodeManager()
+        self.nm = NodeManager
         self.tm = TransactionManager()
 
         self.name = config.getCluster()

neo/node.py

@@ -377,3 +377,5 @@ class NodeManager(object):
             logging.debug(' * %32s | %8s | %22s | %s' % (
                 uuid, node.getType(), address, node.getState()))
 
+# pseudo singleton
+NodeManager = NodeManager()

neo/storage/app.py

@@ -46,7 +46,7 @@ class Application(object):
 
         # Internal attributes.
         self.em = EventManager()
-        self.nm = NodeManager()
+        self.nm = NodeManager
         self.tm = TransactionManager(self)
         self.dm = buildDatabaseManager(config.getAdapter(), config.getDatabase())
 

neo/tests/testNodes.py

@@ -125,7 +125,7 @@ class NodesTests(NeoTestBase):
 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())