You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/08/10 05:33:22 UTC

svn commit: r1371553 - in /activemq/activemq-apollo/trunk: apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala apollo-website/src/documentation/user-manual.md

Author: chirino
Date: Fri Aug 10 03:33:22 2012
New Revision: 1371553

URL: http://svn.apache.org/viewvc?rev=1371553&view=rev
Log:
Also auto tune STOMP's buffer_size setting if not specified.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md

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=1371553&r1=1371552&r2=1371553&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 Fri Aug 10 03:33:22 2012
@@ -640,7 +640,7 @@ class StompProtocolHandler extends Proto
     config.die_delay.getOrElse(DEFAULT_DIE_DELAY)
   }
 
-  lazy val buffer_size = MemoryPropertyEditor.parse(Option(config.buffer_size).getOrElse("640k")).toInt
+  lazy val buffer_size = Option(config.buffer_size).map(MemoryPropertyEditor.parse(_).toInt).getOrElse(broker.auto_tuned_send_receiver_buffer_size*10)
 
   override def set_connection(connection: BrokerConnection) = {
     super.set_connection(connection)

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md?rev=1371553&r1=1371552&r2=1371553&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md Fri Aug 10 03:33:22 2012
@@ -1142,7 +1142,8 @@ in the STOMP protocol implementation.  T
 following configuration attributes:
 
 * `buffer_size` : How much each producer or subscription will buffer between
-   the client and the broker. Defaults to `640k`.
+   the client and the broker. If not set, it will be auto tuned between `640k`
+   and `20k` depending on the number of connections open on the broker.
 * `add_user_header` :  Name of the header which will be added to every received 
   message received.  The value of the header will be set to the id of user that 
   sent the message.  Not set by default.