[Neo-report] r2208 vincent - /trunk/neo/storage/replicator.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Aug 19 12:01:54 2010
New Revision: 2208

Log:
Don't duplicate primary master connection on replicator.

Modified:
    trunk/neo/storage/replicator.py

Modified: trunk/neo/storage/replicator.py
==============================================================================
--- trunk/neo/storage/replicator.py [iso-8859-1] (original)
+++ trunk/neo/storage/replicator.py [iso-8859-1] Thu Aug 19 12:01:54 2010
@@ -82,7 +82,6 @@ class Replicator(object):
         self.new_partition_dict = self._getOutdatedPartitionList()
         self.critical_tid_dict = {}
         self.tid_offset = 0
-        self.primary_master_connection = app.master_conn
         self.reset()
 
     def reset(self):
@@ -121,7 +120,7 @@ class Replicator(object):
                     (dump(uuid), ))
 
     def _askCriticalTID(self):
-        conn = self.primary_master_connection
+        conn = self.app.master_conn
         conn.ask(Packets.AskLastIDs())
         uuid = conn.getUUID()
         self.critical_tid_dict[uuid] = self.new_partition_dict.values()
@@ -136,7 +135,7 @@ class Replicator(object):
         self.unfinished_tid_list = tid_list
 
     def _askUnfinishedTIDs(self):
-        conn = self.primary_master_connection
+        conn = self.app.master_conn
         conn.ask(Packets.AskUnfinishedTransactions())
         self.waiting_for_unfinished_tids = True
 
@@ -185,7 +184,7 @@ class Replicator(object):
         try:
             self.partition_dict.pop(self.current_partition.getRID())
             # Notify to a primary master node that my cell is now up-to-date.
-            conn = self.primary_master_connection
+            conn = self.app.master_conn
             offset = self.current_partition.getRID()
             conn.notify(Packets.NotifyReplicationDone(offset))
         except KeyError: