QPID-2002 : Enable LogActors to log solely about themselves. Situations such as startup would necesitate this, or when a new connection is being created. The addition of a ConnetionSubject would be unnecessary.

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

3 files changed, 22 insertions, 0 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
index cd7992faa7..5ac5eab6c4 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
@@ -37,6 +37,14 @@ public interface RootMessageLogger
      */
     boolean isMessageEnabled(LogActor actor, LogSubject subject);
 
+    /**
+     * Determine if  the LogActor should be generating log messages.
+     *
+     * @param actor   The actor requesting the logging
+     *
+     * @return boolean true if the message should be logged.
+     */
+    boolean isMessageEnabled(LogActor actor);
 
     /**
      * Log the raw message to the configured logger.
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java
index 1c2b4e4046..a3bf276d1e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java
@@ -40,6 +40,11 @@ public class RootMessageLoggerImpl implements RootMessageLogger
         return _enabled;
     }
 
+    public boolean isMessageEnabled(LogActor actor)
+    {
+        return _enabled;
+    }
+
     public void rawMessage(String message)
     {
         _rawLogger.rawMessage(MESSAGE + message);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
index 95f2dc9ff6..4a9c6cbb2f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
@@ -42,4 +42,13 @@ public abstract class AbstractActor implements LogActor
             _rootLogger.rawMessage(_logString + String.valueOf(subject) + message);
         }
     }
+
+    public void message(LogMessage message)
+    {
+        if (_rootLogger.isMessageEnabled(this))
+        {
+            _rootLogger.rawMessage(_logString + message);
+        }
+    }
+
 }