[rhmessaging-commits] rhmessaging commits: r1414 - in mgmt: mint/python/mint and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-03 11:41:30 -0500 (Mon, 03 Dec 2007)
New Revision: 1414

Modified:
   mgmt/cumin/python/cumin/__init__.py
   mgmt/mint/python/mint/__init__.py
Log:
Fixes a data bug, where the default value of registration on Broker
was invalid.



Modified: mgmt/cumin/python/cumin/__init__.py
===================================================================
--- mgmt/cumin/python/cumin/__init__.py	2007-12-03 16:16:29 UTC (rev 1413)
+++ mgmt/cumin/python/cumin/__init__.py	2007-12-03 16:41:30 UTC (rev 1414)
@@ -43,6 +43,11 @@
         for reg in BrokerRegistration.select():
             self.mint.connectToBroker(reg.host, reg.port or 5672)
 
+            if reg.broker is None:
+                pass
+                # wait for configCallback to create Broker in db, then
+                # connect it to the reg
+
         self.cumin_page = CuminPage(self, "cumin.html")
         self.set_default_page(self.cumin_page)
 

Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py	2007-12-03 16:16:29 UTC (rev 1413)
+++ mgmt/mint/python/mint/__init__.py	2007-12-03 16:41:30 UTC (rev 1414)
@@ -16,7 +16,7 @@
     pass
 
 Broker.sqlmeta.addColumn(ForeignKey("BrokerRegistration", cascade="null",
-                                    default="none", name="registration"))
+                                    default=None, name="registration"))
 
 class BrokerRegistration(SQLObject):
   name = StringCol(length=1000, default=None)
@@ -68,8 +68,8 @@
           obj.__init__()
           self.idMap[idOriginal] = obj
         else:
-          print "\n\n=============== %s %d NOT found, NOT creating\n\n" % (objType.__name__, idOriginal)
-          #pass
+          #print "\n\n=============== %s %d NOT found, NOT creating\n\n" % (objType.__name__, idOriginal)
+          pass
       else:
         #print "\n\n=============== %s %d found AFTER QUERY\n\n" % (objType.__name__, idOriginal)
         pass