diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2008-05-16 14:51:07 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2008-05-16 14:51:07 +0000 |
| commit | 432a5840f2f325eb14ff7f61ea7e33195396c05a (patch) | |
| tree | 991ec9f18a045b6b58a0cba749f81d68f6950ae7 /python/qpid/managementdata.py | |
| parent | 7b9e370d29da677d70dd98e3c254ac71a3b0b8ab (diff) | |
| download | qpid-python-432a5840f2f325eb14ff7f61ea7e33195396c05a.tar.gz | |
QPID-1067
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@657088 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid/managementdata.py')
| -rw-r--r-- | python/qpid/managementdata.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/python/qpid/managementdata.py b/python/qpid/managementdata.py index 36eb442e0d..b04a58ddac 100644 --- a/python/qpid/managementdata.py +++ b/python/qpid/managementdata.py @@ -79,11 +79,11 @@ class ManagementData: def displayObjId (self, objId): bank = (objId & 0x0000FFFFFF000000L) >> 24 id = objId & 0x0000000000FFFFFFL - return bank * 1000 + id + return bank * 10000 + id def rawObjId (self, displayId): - bank = displayId / 1000 - id = displayId % 1000 + bank = displayId / 10000 + id = displayId % 10000 if bank < 5: objId = (bank << 24) + id else: @@ -135,13 +135,15 @@ class ManagementData: value = oldInst[idx][1] newInst.append ((key, value)) self.tables[className][id] = (timestamps, oldConf, newInst) - + finally: self.lock.release () def ctrlHandler (self, context, op, data): if op == self.mclient.CTRL_BROKER_INFO: pass + elif op == self.mclient.CTRL_HEARTBEAT: + pass def configHandler (self, context, className, list, timestamps): self.dataHandler (0, className, list, timestamps); @@ -174,9 +176,7 @@ class ManagementData: def setCli (self, cliobj): self.cli = cliobj - def __init__ (self, disp, host, username="guest", password="guest", - specfile="../../specs/amqp.0-10.xml"): - self.spec = qpid.spec.load (specfile) + def __init__ (self, disp, host, username="guest", password="guest"): self.lock = Lock () self.tables = {} self.schema = {} @@ -188,8 +188,9 @@ class ManagementData: self.sessionId = "%s.%d" % (os.uname()[1], os.getpid()) self.broker = Broker (host) - self.conn = Connection (connect (self.broker.host, self.broker.port), self.spec, + self.conn = Connection (connect (self.broker.host, self.broker.port), username=self.broker.username, password=self.broker.password) + self.spec = self.conn.spec self.conn.start () self.mclient = managementClient (self.spec, self.ctrlHandler, self.configHandler, |