You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gr...@apache.org on 2010/11/10 16:01:43 UTC

svn commit: r1033506 - in /qpid/branches/0.5.x-dev/qpid/java/broker/src: main/java/org/apache/qpid/server/logging/messages/ main/java/org/apache/qpid/server/registry/ velocity/java/org/apache/qpid/server/logging/

Author: grkvlt
Date: Wed Nov 10 15:01:42 2010
New Revision: 1033506

URL: http://svn.apache.org/viewvc?rev=1033506&view=rev
Log:
QPID-2932: Update operational logging messages

Modified:
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties?rev=1033506&r1=1033505&r2=1033506&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties Wed Nov 10 15:01:42 2010
@@ -222,8 +222,8 @@ BRK_STOPPED = BRK-1005 : Stopped
 BRK_CONFIG = BRK-1006 : Using configuration : {0}
 # 0 - path
 BRK_LOG_CONFIG = BRK-1007 : Using logging configuration : {0}
-BRK_STATS_DATA = BRK-1008 : {0} : {1,number,#.###} kB/s, {2,number,#} bytes
-BRK_STATS_MSGS = BRK-1009 : {0} : {1,number,#.###} msg/s, {2,number,#} msgs
+BRK_STATS_DATA = BRK-1008 : {0,choice,0#delivered|1#received} : {1,number,#.###} kB/s peak : {2,number,#} bytes total
+BRK_STATS_MSGS = BRK-1009 : {0,choice,0#delivered|1#received} : {1,number,#.###} msg/s peak : {2,number,#} msgs total
 
 #ManagementConsole
 MNG_STARTUP = MNG-1001 : Startup
@@ -245,8 +245,8 @@ MNG_CLOSE = MNG-1008 : Close
 # 0 - name
 VHT_CREATED = VHT-1001 : Created : {0}
 VHT_CLOSED = VHT-1002 : Closed
-VHT_STATS_DATA = VHT-1003 : {0} : {1} : {2,number,#.###} kB/s, {3,number,#} bytes
-VHT_STATS_MSGS = VHT-1004 : {0} : {1} : {2,number,#.###} msg/s, {3,number,#} msgs
+VHT_STATS_DATA = VHT-1003 : {0} : {1,choice,0#delivered|1#received} : {2,number,#.###} kB/s peak : {3,number,#} bytes total
+VHT_STATS_MSGS = VHT-1004 : {0} : {1,choice,0#delivered|1#received} : {2,number,#.###} msg/s peak : {3,number,#} msgs total
 
 #MessageStore
 # 0 - name

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1033506&r1=1033505&r2=1033506&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Wed Nov 10 15:01:42 2010
@@ -350,7 +350,8 @@ public abstract class ApplicationRegistr
 	        
             class StatisticsReportingTask extends TimerTask
             {
-                Logger _srLogger = Logger.getLogger(StatisticsReportingTask.class);
+                private final int DELIVERED = 0;
+                private final int RECEIVED = 1;
                 
                 public void run()
                 {
@@ -363,10 +364,10 @@ public abstract class ApplicationRegistr
                     
                     if (broker)
                     {
-	                    CurrentActor.get().message(BrokerMessages.BRK_STATS_DATA("delivered", _dataDelivered.getPeak() / 1024.0, _dataDelivered.getTotal()));
-	                    CurrentActor.get().message(BrokerMessages.BRK_STATS_MSGS("delivered", _messagesDelivered.getPeak(), _messagesDelivered.getTotal()));
-	                    CurrentActor.get().message(BrokerMessages.BRK_STATS_DATA("received", _dataReceived.getPeak() / 1024.0, _dataReceived.getTotal()));
-	                    CurrentActor.get().message(BrokerMessages.BRK_STATS_MSGS("received", _messagesReceived.getPeak(), _messagesReceived.getTotal()));
+	                    CurrentActor.get().message(BrokerMessages.BRK_STATS_DATA(DELIVERED, _dataDelivered.getPeak() / 1024.0, _dataDelivered.getTotal()));
+	                    CurrentActor.get().message(BrokerMessages.BRK_STATS_MSGS(DELIVERED, _messagesDelivered.getPeak(), _messagesDelivered.getTotal()));
+	                    CurrentActor.get().message(BrokerMessages.BRK_STATS_DATA(RECEIVED, _dataReceived.getPeak() / 1024.0, _dataReceived.getTotal()));
+	                    CurrentActor.get().message(BrokerMessages.BRK_STATS_MSGS(RECEIVED, _messagesReceived.getPeak(), _messagesReceived.getTotal()));
                     }
                     
                     if (virtualhost)
@@ -379,10 +380,10 @@ public abstract class ApplicationRegistr
 	                        StatisticsCounter dataReceived = vhost.getDataReceiptStatistics();
 	                        StatisticsCounter messagesReceived = vhost.getMessageReceiptStatistics();
 	                        
-	                        CurrentActor.get().message(VirtualHostMessages.VHT_STATS_DATA(name, "delivered", dataDelivered.getPeak() / 1024.0, dataDelivered.getTotal()));
-	                        CurrentActor.get().message(VirtualHostMessages.VHT_STATS_MSGS(name, "delivered", messagesDelivered.getPeak(), messagesDelivered.getTotal()));
-	                        CurrentActor.get().message(VirtualHostMessages.VHT_STATS_DATA(name, "received", dataReceived.getPeak() / 1024.0, dataReceived.getTotal()));
-	                        CurrentActor.get().message(VirtualHostMessages.VHT_STATS_MSGS(name, "received", messagesReceived.getPeak(), messagesReceived.getTotal()));
+	                        CurrentActor.get().message(VirtualHostMessages.VHT_STATS_DATA(name, DELIVERED, dataDelivered.getPeak() / 1024.0, dataDelivered.getTotal()));
+	                        CurrentActor.get().message(VirtualHostMessages.VHT_STATS_MSGS(name, DELIVERED, messagesDelivered.getPeak(), messagesDelivered.getTotal()));
+	                        CurrentActor.get().message(VirtualHostMessages.VHT_STATS_DATA(name, RECEIVED, dataReceived.getPeak() / 1024.0, dataReceived.getTotal()));
+	                        CurrentActor.get().message(VirtualHostMessages.VHT_STATS_MSGS(name, RECEIVED, messagesReceived.getPeak(), messagesReceived.getTotal()));
 	                    }
                     }
                     

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java?rev=1033506&r1=1033505&r2=1033506&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java Wed Nov 10 15:01:42 2010
@@ -431,7 +431,7 @@ public class GenerateLogMessages
                     // Only check the text inside the braces '{}'
                     int typeIndexEnd = parametersString[index].indexOf("}", typeIndex);
                     String typeString = parametersString[index].substring(typeIndex, typeIndexEnd);
-                    if (typeString.contains("number"))
+                    if (typeString.contains("number") || typeString.contains("choice"))
                     {
                         type = "Number";
                     }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org