changes incorporate incoming DB

LearningRegistry · Apr 2, 2012 · 05d08b1 · 05d08b1
1 parent 27a6f44
commit 05d08b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/LR/lr/controllers/distribute.py b/LR/lr/controllers/distribute.py
@@ -38,6 +38,7 @@ class DistributeController(BaseController):
 
     def __before__(self):
         self.resource_data = appConfig['couchdb.db.resourcedata']
+        self.incoming = appConfig['couchdb.db.incoming']
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
@@ -176,7 +177,8 @@ def doDistribution(connectionInfo, server, sourceUrl):
             #if distinationNode['distribute service'] .service_auth["service_authz"] is not  None:
                 #log.info("Destination node '{}' require authentication".format(destinationUrl))
                 #Try to get the user name and password the url
-            destinationUrl = connectionInfo['destinationNodeInfo'].resource_data_url
+            #destinationUrl = connectionInfo['destinationNodeInfo'].resource_data_url
+            destinationUrl = connectionInfo['destinationNodeInfo'].incoming_url
 
             credential = sourceLRNode.getDistributeCredentialFor(destinationUrl)
             if credential is not None:
@@ -222,7 +224,8 @@ def doDistribution(connectionInfo, server, sourceUrl):
             if connectionsStatusInfo.has_key(self.__ERROR) or connectionStatus.has_key(self.__ERROR) == True:
                 distributeResults.put(connectionStatus)
             else:
-                replicationArgs = (connectionStatus, defaultCouchServer, self.resource_data )
+                replicationArgs = (connectionStatus, defaultCouchServer, self.incoming )
+                #replicationArgs = (connectionStatus, defaultCouchServer, self.resource_data )
                     # Use a thread to do the actual replication.
                 replicationThread = threading.Thread(target=doDistribution, args=replicationArgs)
                 replicationThread.start()

diff --git a/LR/lr/model/__init__.py b/LR/lr/model/__init__.py
@@ -78,3 +78,5 @@ def getNodeConfig():
 # periodic distribution.
 monitorResourceDataChanges()
 
+
+
diff --git a/LR/lr/model/node_config.py b/LR/lr/model/node_config.py
@@ -286,6 +286,7 @@ def getDistributeInfo(self):
                                     'gateway_node':self.nodeDescription.gateway_node,
                                     'social_community':self.communityDescription.social_community,
                                     'resource_data_url': appConfig['lr.distribute_resource_data_url'],
+                                    'incoming_url': appConfig['lr.distribute_incoming_url'],
                                     'filter_description':self.filterDescription.specData
                                 }
         return distributeInfo