2 files changed, 9 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java b/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
index 859d7e2a27..bcb9cb2ac4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
@@ -76,7 +76,7 @@ public class ChannelLogSubject extends AbstractLogSubject
             setLogStringWithFormat(CHANNEL_FORMAT,
                                    connection == null ? -1L : connection.getConnectionId(),
                                    session.getAuthorizedPrincipal() == null ? "?" : session.getAuthorizedPrincipal().getName(),
-                                   (connection == null || connection.getConfig() == null) ? "?" : connection.getConfig().getAddress(),
+                                   (connection == null || connection.getRemoteAddressString() == null) ? "?" : connection.getRemoteAddressString(),
                                    session.getVirtualHost().getName(),
                                    session.getChannel());
         }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java b/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
index 28c4f0d52a..7611ee1a88 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
@@ -32,11 +32,19 @@ package org.apache.qpid.server.logging.subjects;
 
 public class LogSubjectFormat
 {
+
     private LogSubjectFormat()
     {
     }
 
     /**
+     * LOG FORMAT for the ManagementActors,
+     * 0 - User ID
+     * 1 - IP[:Port]
+     */
+    public static final String MANAGEMENT_FORMAT = "mng:{0}({1})";
+
+    /**
      * LOG FORMAT for the Subscription Log Subject
      * 0 - Subscription ID
      */