activemq-commits mailing list archives

Author: chirino
Date: Tue Jan 24 16:57:57 2012
New Revision: 1235354

URL: http://svn.apache.org/viewvc?rev=1235354&view=rev
Log:
Provide nicer consumer labels in the management interface.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala?rev=1235354&r1=1235353&r2=1235354&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Binding.scala
Tue Jan 24 16:57:57 2012
@@ -163,6 +163,7 @@ class QueueDomainQueueBinding(val bindin
 
   def config(host:VirtualHost):QueueDTO = queue_config(host, destination)
 
+  override def toString = "queue: "+id
 }
 
 
@@ -247,6 +248,7 @@ class DurableSubscriptionQueueBinding(va
 
   def config(host:VirtualHost):DurableSubscriptionDTO = dsub_config(host, binding_dto.subscription_id)
 
+  override def toString = "dsub: "+binding_dto.subscription_id
 }
 
 
@@ -291,4 +293,5 @@ class TempQueueBinding(val key:AnyRef, v
     case _ => false
   }
 
+  override def toString = "temp queue: "+key
 }

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala?rev=1235354&r1=1235353&r2=1235354&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
Tue Jan 24 16:57:57 2012
@@ -63,7 +63,7 @@ import Queue._
 class Queue(val router: LocalRouter, val store_id:Long, var binding:Binding, var config:QueueDTO)
extends BaseRetained with BindableDeliveryProducer with DeliveryConsumer with BaseService
with DomainDestination with Dispatched with SecuredResource {
   def id = binding.id
 
-  override def toString = binding.destination.toString
+  override def toString = binding.toString
 
   def virtual_host = router.virtual_host
 

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1235354&r1=1235353&r2=1235354&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
Tue Jan 24 16:57:57 2012
@@ -768,6 +768,8 @@ class OpenwireProtocolHandler extends Pr
 //      r.release
 //    }
 
+    override def toString = "openwire consumer id:"+info.getConsumerId+", remote address:
"+security_context.remote_address
+
     var selector_expression:BooleanExpression = _
     var destination:Array[DestinationDTO] = _
 

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1235354&r1=1235353&r2=1235354&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
Tue Jan 24 16:57:57 2012
@@ -170,6 +170,9 @@ class StompProtocolHandler extends Proto
 //      r.release
 //    }
 
+
+    override def toString = "stomp subscription"+subscription_id.map(" id: "+_+",").getOrElse("")+"
remote address: "+security_context.remote_address
+
     override def start_from_tail = from_seq == -1
 
     var starting_seq:Long = 0L