You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/08/30 17:19:35 UTC
svn commit: r990820 - in /qpid/trunk/qpid/java/broker/src:
main/java/org/apache/qpid/server/logging/
main/java/org/apache/qpid/server/logging/actors/
main/java/org/apache/qpid/server/logging/subjects/
main/java/org/apache/qpid/server/transport/ test/ja...
Author: robbie
Date: Mon Aug 30 15:19:34 2010
New Revision: 990820
URL: http://svn.apache.org/viewvc?rev=990820&view=rev
Log:
QPID-2824: Use toLogString rather than toString on LogSubject(s)
Applied patch from Sorin Suciu <ss...@gmail.com>
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java Mon Aug 30 15:19:34 2010
@@ -24,14 +24,13 @@ package org.apache.qpid.server.logging;
* Each LogSubject that wishes to be logged will implement this to provide their
* own display representation.
*
- * The display representation is retrieved through the toString() method.
*/
public interface LogSubject
{
/**
- * Logs the message as provided by String.valueOf(message).
+ * Provides the log message as as String.
*
* @returns String the display representation of this LogSubject
*/
- public String toString();
+ public String toLogString();
}
\ No newline at end of file
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java Mon Aug 30 15:19:34 2010
@@ -58,7 +58,7 @@ public class AMQPChannelActor extends Ab
public String getLogMessage()
{
- return _logString.toString();
+ return _logString.toLogString();
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java Mon Aug 30 15:19:34 2010
@@ -48,7 +48,7 @@ public class AMQPConnectionActor extends
public String getLogMessage()
{
- return _logSubject.toString();
+ return _logSubject.toLogString();
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java Mon Aug 30 15:19:34 2010
@@ -44,7 +44,7 @@ public abstract class AbstractActor impl
{
if (_rootLogger.isMessageEnabled(this, subject, message.getLogHierarchy()))
{
- _rootLogger.rawMessage(DEFAULT_MSG_PREFIX + getLogMessage() + String.valueOf(subject) + message, message.getLogHierarchy());
+ _rootLogger.rawMessage(DEFAULT_MSG_PREFIX + getLogMessage() + subject.toLogString() + message, message.getLogHierarchy());
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java Mon Aug 30 15:19:34 2010
@@ -49,7 +49,7 @@ public class QueueActor extends Abstract
public String getLogMessage()
{
- return _logSubject.toString();
+ return _logSubject.toLogString();
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java Mon Aug 30 15:19:34 2010
@@ -41,6 +41,6 @@ public class SubscriptionActor extends A
public String getLogMessage()
{
- return _logSubject.toString();
+ return _logSubject.toLogString();
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java Mon Aug 30 15:19:34 2010
@@ -34,7 +34,7 @@ import java.text.MessageFormat;
public abstract class AbstractLogSubject implements LogSubject
{
/**
- * The logString that will be returned via toString
+ * The logString that will be returned via toLogString
*/
protected String _logString;
@@ -50,13 +50,12 @@ public abstract class AbstractLogSubject
}
/**
- * ToString is how the Logging infrastructure will get the text for this
+ * toLogString is how the Logging infrastructure will get the text for this
* LogSubject
*
* @return String representing this LogSubject
*/
- @Override
- public String toString()
+ public String toLogString()
{
return _logString;
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java Mon Aug 30 15:19:34 2010
@@ -128,10 +128,9 @@ public class ConnectionLogSubject extend
}
}
- @Override
- public String toString()
+ public String toLogString()
{
updateLogString();
- return super.toString();
+ return super.toLogString();
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java Mon Aug 30 15:19:34 2010
@@ -40,6 +40,6 @@ public class QueueLogSubject extends Abs
{
setLogStringWithFormat(LOG_FORMAT,
queue.getVirtualHost().getName(),
- queue.getNameShortString());
+ queue.getName());
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java Mon Aug 30 15:19:34 2010
@@ -29,8 +29,8 @@ public class SubscriptionLogSubject exte
/**
* LOG FORMAT for the SubscriptionLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Subscription ID
*/
@@ -47,7 +47,7 @@ public class SubscriptionLogSubject exte
// log string format is:
// [ sub:<id>(vh(<vhost>)/qu(<queue>)) ]
- String queueString = new QueueLogSubject(subscription.getQueue()).toString();
+ String queueString = new QueueLogSubject(subscription.getQueue()).toLogString();
_logString = "[" + MessageFormat.format(SubscriptionLogSubject.SUBSCRIPTION_FORMAT,
subscription.getSubscriptionID())
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java Mon Aug 30 15:19:34 2010
@@ -575,7 +575,14 @@ public class ServerSession extends Sessi
public LogSubject getLogSubject()
{
- return null;
+ return new LogSubject()
+ {
+ public String toLogString()
+ {
+ return "[ ]";
+ }
+
+ };
}
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java Mon Aug 30 15:19:34 2010
@@ -113,7 +113,7 @@ public class AMQPConnectionActorTest ext
_amqpActor.message(new LogSubject()
{
- public String toString()
+ public String toLogString()
{
return "[AMQPActorTest]";
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java Mon Aug 30 15:19:34 2010
@@ -69,7 +69,7 @@ public class BaseActorTestCase extends I
{
actor.message(new LogSubject()
{
- public String toString()
+ public String toLogString()
{
return message;
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java Mon Aug 30 15:19:34 2010
@@ -83,7 +83,7 @@ public abstract class AbstractTestMessag
// Simple switch to print out all the logged messages
//System.err.println(log);
- int msgIndex = log.indexOf(_logSubject.toString())+_logSubject.toString().length();
+ int msgIndex = log.indexOf(_logSubject.toLogString())+_logSubject.toLogString().length();
assertTrue("Unable to locate Subject:" + log, msgIndex != -1);
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=990820&r1=990819&r2=990820&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java Mon Aug 30 15:19:34 2010
@@ -91,7 +91,14 @@ public class MockAMQQueue implements AMQ
public LogSubject getLogSubject()
{
- return null;
+ return new LogSubject()
+ {
+ public String toLogString()
+ {
+ return "[MockAMQQueue]";
+ }
+
+ };
}
public ConfigStore getConfigStore()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org