From ba5c0d2065986bf39225b96c23f0f129f42a718a Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Wed, 9 Oct 2013 14:32:10 +0000 Subject: QPID-5216 - Fixed a number of issues found during a three-node test - Reduced the amount of log output at the DEBUG level - Added configuration files for the three-node test (linear A-B-C topology) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1530631 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/extras/dispatch/python/qpid/dispatch/router/link.py | 1 + .../dispatch/python/qpid/dispatch/router/router_engine.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'qpid/extras/dispatch/python') diff --git a/qpid/extras/dispatch/python/qpid/dispatch/router/link.py b/qpid/extras/dispatch/python/qpid/dispatch/router/link.py index 4a770684cd..11307cd079 100644 --- a/qpid/extras/dispatch/python/qpid/dispatch/router/link.py +++ b/qpid/extras/dispatch/python/qpid/dispatch/router/link.py @@ -92,6 +92,7 @@ class LinkStateEngine(object): # Schedule LSRs for any routers referenced in this LS that we don't know about for _id in msg.ls.peers: if _id not in self.collection: + self.container.new_node(_id) self.needed_lsrs[(msg.area, _id)] = None diff --git a/qpid/extras/dispatch/python/qpid/dispatch/router/router_engine.py b/qpid/extras/dispatch/python/qpid/dispatch/router/router_engine.py index 03bf0638a5..d5250872b2 100644 --- a/qpid/extras/dispatch/python/qpid/dispatch/router/router_engine.py +++ b/qpid/extras/dispatch/python/qpid/dispatch/router/router_engine.py @@ -143,28 +143,28 @@ class RouterEngine: elif opcode == 'RA': msg = MessageRA(body) - self.log(LOG_TRACE, "RCVD: %r" % msg) + self.log(LOG_DEBUG, "RCVD: %r" % msg) self.link_state_engine.handle_ra(msg, now) self.mobile_address_engine.handle_ra(msg, now) elif opcode == 'LSU': msg = MessageLSU(body) - self.log(LOG_TRACE, "RCVD: %r" % msg) + self.log(LOG_DEBUG, "RCVD: %r" % msg) self.link_state_engine.handle_lsu(msg, now) elif opcode == 'LSR': msg = MessageLSR(body) - self.log(LOG_TRACE, "RCVD: %r" % msg) + self.log(LOG_DEBUG, "RCVD: %r" % msg) self.link_state_engine.handle_lsr(msg, now) elif opcode == 'MAU': msg = MessageMAU(body) - self.log(LOG_TRACE, "RCVD: %r" % msg) + self.log(LOG_DEBUG, "RCVD: %r" % msg) self.mobile_address_engine.handle_mau(msg, now) elif opcode == 'MAR': msg = MessageMAR(body) - self.log(LOG_TRACE, "RCVD: %r" % msg) + self.log(LOG_DEBUG, "RCVD: %r" % msg) self.mobile_address_engine.handle_mar(msg, now) except Exception, e: @@ -223,7 +223,10 @@ class RouterEngine: """ app_props = {'opcode' : msg.get_opcode() } self.io_adapter.send(dest, app_props, msg.to_dict()) - self.log(LOG_TRACE, "SENT: %r dest=%s" % (msg, dest)) + if "qdxhello" in dest: + self.log(LOG_TRACE, "SENT: %r dest=%s" % (msg, dest)) + else: + self.log(LOG_DEBUG, "SENT: %r dest=%s" % (msg, dest)) def node_updated(self, addr, reachable, neighbor): -- cgit v1.2.1