QPID-1476 - routing keys used for updates can't be used to discriminate by agent

- Fixed routing keys in agents and binding keys in consoles
- Added some additional debug output for ManagementAgentImpl
- Minor cleanup in the connection close path for ManagementAgentImpl


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@719245 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/ruby/lib/qpid/qmf.rb b/qpid/ruby/lib/qpid/qmf.rb
index 2b7ab58e96..378d4068be 100644
--- a/qpid/ruby/lib/qpid/qmf.rb
+++ b/qpid/ruby/lib/qpid/qmf.rb
@@ -217,7 +217,7 @@ module Qpid::Qmf
       @brokers.each do |broker|
         args = { :exchange => "qpid.management",
           :queue => broker.topicName,
-          :binding_key => "console.obj.#{package_name}.#" }
+          :binding_key => "console.obj.*.*.#{package_name}.#" }
         broker.amqpSession.exchange_bind(args)
       end
     end
@@ -230,7 +230,7 @@ module Qpid::Qmf
       @brokers.each do |broker|
         args = { :exchange => "qpid.management",
           :queue => broker.topicName,
-          :binding_key => "console.obj.#{pname}.#{cname}.#" }
+          :binding_key => "console.obj.*.*.#{pname}.#{cname}.#" }
         broker.amqpSession.exchange_bind(args)
       end
     end
@@ -637,7 +637,7 @@ module Qpid::Qmf
         if @rcv_objects && ! @user_bindings
           key_list << "console.obj.#"
         else
-          key_list << "console.obj.org.apache.qpid.broker.agent"
+          key_list << "console.obj.*.*.org.apache.qpid.broker.agent"
         end
         key_list << "console.event.#" if @rcv_events
         key_list << "console.heartbeat.#" if @rcv_heartbeats