Author: nunofsantos Date: 2008-05-13 15:04:14 -0400 (Tue, 13 May 2008) New Revision: 2043 Modified: mgmt/mint/python/mint/schema.py Log: handle close callback from broker Modified: mgmt/mint/python/mint/schema.py =================================================================== --- mgmt/mint/python/mint/schema.py 2008-05-13 19:04:03 UTC (rev 2042) +++ mgmt/mint/python/mint/schema.py 2008-05-13 19:04:14 UTC (rev 2043) @@ -85,11 +85,16 @@ conn.callMethod(self.idOriginal, classInfo, "echo", callback, args=actualArgs) - def connect(self, model, callback, host, port): + def connect(self, model, callback, host, port, useSsl, durable, authMechanism, username, password): """Establish a connection to another broker""" actualArgs = dict() actualArgs["host"] = host actualArgs["port"] = port + actualArgs["useSsl"] = useSsl + actualArgs["durable"] = durable + actualArgs["authMechanism"] = authMechanism + actualArgs["username"] = username + actualArgs["password"] = password conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] conn.callMethod(self.idOriginal, classInfo, "connect", @@ -122,7 +127,10 @@ managedBroker = StringCol(length=1000, default=None) statsCurr = ForeignKey('AgentStats', cascade='null', default=None) statsPrev = ForeignKey('AgentStats', cascade='null', default=None) - id_ = BLOBCol(default=None) + sessionId = BLOBCol(default=None) + label = StringCol(length=1000, default=None) + registeredTo = BigIntCol(default=None) + sysId = BLOBCol(default=None) classInfos = dict() # brokerId => classInfo @@ -272,6 +280,7 @@ vhost = ForeignKey('Vhost', cascade='null', default=None) name = StringCol(length=1000, default=None) type = StringCol(length=1000, default=None) + durable = BoolCol(default=None) classInfos = dict() # brokerId => classInfo @@ -353,6 +362,7 @@ statsPrev = ForeignKey('ClientStats', cascade='null', default=None) vhost = ForeignKey('Vhost', cascade='null', default=None) address = StringCol(length=1000, default=None) + incoming = BoolCol(default=None) classInfos = dict() # brokerId => classInfo @@ -397,8 +407,10 @@ statsCurr = ForeignKey('LinkStats', cascade='null', default=None) statsPrev = ForeignKey('LinkStats', cascade='null', default=None) vhost = ForeignKey('Vhost', cascade='null', default=None) - address = StringCol(length=1000, default=None) - authIdentity = StringCol(length=1000, default=None) + host = StringCol(length=1000, default=None) + port = SmallIntCol(default=None) + useSsl = BoolCol(default=None) + durable = BoolCol(default=None) classInfos = dict() # brokerId => classInfo @@ -409,12 +421,15 @@ conn.callMethod(self.idOriginal, classInfo, "close", callback, args=actualArgs) - def bridge(self, model, callback, src, dest, key, src_is_queue, src_is_local): + def bridge(self, model, callback, durable, src, dest, key, id, excludes, src_is_queue, src_is_local): """Bridge messages over the link""" actualArgs = dict() + actualArgs["durable"] = durable actualArgs["src"] = src actualArgs["dest"] = dest actualArgs["key"] = key + actualArgs["id"] = id + actualArgs["excludes"] = excludes actualArgs["src_is_queue"] = src_is_queue actualArgs["src_is_local"] = src_is_local conn = model.connections[self.managedBroker] @@ -432,11 +447,8 @@ idOriginal = BigIntCol(default=None) recTime = TimestampCol(default=None) link = ForeignKey('Link', cascade='null', default=None) - closing = BoolCol(default=None) - framesFromPeer = BigIntCol(default=None) - framesToPeer = BigIntCol(default=None) - bytesFromPeer = BigIntCol(default=None) - bytesToPeer = BigIntCol(default=None) + state = StringCol(length=1000, default=None) + lastError = StringCol(length=1000, default=None) classInfos = dict() # brokerId => classInfo