Author: justi9 Date: 2008-12-03 17:26:35 -0500 (Wed, 03 Dec 2008) New Revision: 2923 Modified: mgmt/trunk/cumin/python/cumin/model.py mgmt/trunk/mint/python/mint/__init__.py mgmt/trunk/mint/python/mint/update.py Log: Use the right mintBrokers mapping Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-12-03 22:12:02 UTC (rev 2922) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-12-03 22:26:35 UTC (rev 2923) @@ -258,9 +258,9 @@ def get_session_by_registration(self, reg): assert reg.broker - assert reg.broker.qmfBrokerId in self.model.data.mintBrokers + assert reg.broker.qmfBrokerId in self.model.data.mintBrokersById - broker = self.model.data.mintBrokers[reg.broker.qmfBrokerId] + broker = self.model.data.mintBrokersById[reg.broker.qmfBrokerId] return broker.getAmqpSession() class CuminActionInvocation(object): Modified: mgmt/trunk/mint/python/mint/__init__.py =================================================================== --- mgmt/trunk/mint/python/mint/__init__.py 2008-12-03 22:12:02 UTC (rev 2922) +++ mgmt/trunk/mint/python/mint/__init__.py 2008-12-03 22:26:35 UTC (rev 2923) @@ -510,8 +510,6 @@ log.exception(e) def do_run(self): - log.info("Polling") - regUrls = set() for reg in BrokerRegistration.select(): Modified: mgmt/trunk/mint/python/mint/update.py =================================================================== --- mgmt/trunk/mint/python/mint/update.py 2008-12-03 22:12:02 UTC (rev 2922) +++ mgmt/trunk/mint/python/mint/update.py 2008-12-03 22:26:35 UTC (rev 2923) @@ -236,8 +236,6 @@ log.debug("%s(%i) created", cls.__name__, id) - if cls is Broker: - self.processBroker(cursor, id) else: # Case 2 @@ -249,6 +247,9 @@ assert cursor.rowcount == 1 self.broker.objectDatabaseIds.set(oid, id) + + if cls is Broker: + self.processBroker(cursor, id) else: # Case 3 @@ -272,6 +273,8 @@ pass def processBroker(self, cursor, id): + print "self.broker.databaseId", self.broker.databaseId + if self.broker.databaseId is None: op = SqlGetBrokerRegistration() op.execute(cursor, {"url": self.broker.url})