QPID-5998: Fix HA operational logging

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

5 files changed, 103 insertions, 130 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
index 9e497efcd2..b864a8c095 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
@@ -44,15 +44,15 @@ public class HighAvailabilityMessages
     private static Locale _currentLocale = BrokerProperties.getLocale();
 
     public static final String HIGHAVAILABILITY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability";
-    public static final String STOPPED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.stopped";
     public static final String INTRUDER_DETECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.intruder_detected";
-    public static final String STARTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.started";
     public static final String TRANSFER_MASTER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.transfer_master";
     public static final String QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.quorum_override_changed";
-    public static final String DETACHED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.detached";
-    public static final String MAJORITY_LOST_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.majority_lost";
+    public static final String REMOVED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.removed";
+    public static final String LEFT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.left";
+    public static final String JOINED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.joined";
+    public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.created";
+    public static final String QUORUM_LOST_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.quorum_lost";
     public static final String PRIORITY_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.priority_changed";
-    public static final String ATTACHED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.attached";
     public static final String ADDED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.added";
     public static final String DELETED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.deleted";
     public static final String ROLE_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.role_changed";
@@ -61,15 +61,15 @@ public class HighAvailabilityMessages
     static
     {
         Logger.getLogger(HIGHAVAILABILITY_LOG_HIERARCHY);
-        Logger.getLogger(STOPPED_LOG_HIERARCHY);
         Logger.getLogger(INTRUDER_DETECTED_LOG_HIERARCHY);
-        Logger.getLogger(STARTED_LOG_HIERARCHY);
         Logger.getLogger(TRANSFER_MASTER_LOG_HIERARCHY);
         Logger.getLogger(QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY);
-        Logger.getLogger(DETACHED_LOG_HIERARCHY);
-        Logger.getLogger(MAJORITY_LOST_LOG_HIERARCHY);
+        Logger.getLogger(REMOVED_LOG_HIERARCHY);
+        Logger.getLogger(LEFT_LOG_HIERARCHY);
+        Logger.getLogger(JOINED_LOG_HIERARCHY);
+        Logger.getLogger(CREATED_LOG_HIERARCHY);
+        Logger.getLogger(QUORUM_LOST_LOG_HIERARCHY);
         Logger.getLogger(PRIORITY_CHANGED_LOG_HIERARCHY);
-        Logger.getLogger(ATTACHED_LOG_HIERARCHY);
         Logger.getLogger(ADDED_LOG_HIERARCHY);
         Logger.getLogger(DELETED_LOG_HIERARCHY);
         Logger.getLogger(ROLE_CHANGED_LOG_HIERARCHY);
@@ -80,14 +80,14 @@ public class HighAvailabilityMessages
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1012 : The node ''{0}'' from the replication group ''{1}'' is stopped.</pre>
+     * <pre>HA-1008 : Intruder detected : Node ''{0}'' ({1})</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage STOPPED(String param1, String param2)
+    public static LogMessage INTRUDER_DETECTED(String param1, String param2)
     {
-        String rawMessage = _messages.getString("STOPPED");
+        String rawMessage = _messages.getString("INTRUDER_DETECTED");
 
         final Object[] messageArguments = {param1, param2};
         // Create a new MessageFormat to ensure thread safety.
@@ -105,23 +105,23 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return STOPPED_LOG_HIERARCHY;
+                return INTRUDER_DETECTED_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1007: Intruder node ''{0}'' from ''{1}'' is detected in replication group ''{2}''</pre>
+     * <pre>HA-1007 : Master transfer requested : to ''{0}'' ({1})</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage INTRUDER_DETECTED(String param1, String param2, String param3)
+    public static LogMessage TRANSFER_MASTER(String param1, String param2)
     {
-        String rawMessage = _messages.getString("INTRUDER_DETECTED");
+        String rawMessage = _messages.getString("TRANSFER_MASTER");
 
-        final Object[] messageArguments = {param1, param2, param3};
+        final Object[] messageArguments = {param1, param2};
         // Create a new MessageFormat to ensure thread safety.
         // Sharing a MessageFormat and using applyPattern is not thread safe
         MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
@@ -137,23 +137,23 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return INTRUDER_DETECTED_LOG_HIERARCHY;
+                return TRANSFER_MASTER_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1013 : The node ''{0}'' from the replication group ''{1}'' is started.</pre>
+     * <pre>HA-1011 : Minimum group  : {0}</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage STARTED(String param1, String param2)
+    public static LogMessage QUORUM_OVERRIDE_CHANGED(String param1)
     {
-        String rawMessage = _messages.getString("STARTED");
+        String rawMessage = _messages.getString("QUORUM_OVERRIDE_CHANGED");
 
-        final Object[] messageArguments = {param1, param2};
+        final Object[] messageArguments = {param1};
         // Create a new MessageFormat to ensure thread safety.
         // Sharing a MessageFormat and using applyPattern is not thread safe
         MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
@@ -169,23 +169,23 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return STARTED_LOG_HIERARCHY;
+                return QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1014 : Transfer master to ''{0}'' is requested on node ''{1}'' from the replication group ''{2}''.</pre>
+     * <pre>HA-1004 : Removed : Node : ''{0}'' ({1})</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage TRANSFER_MASTER(String param1, String param2, String param3)
+    public static LogMessage REMOVED(String param1, String param2)
     {
-        String rawMessage = _messages.getString("TRANSFER_MASTER");
+        String rawMessage = _messages.getString("REMOVED");
 
-        final Object[] messageArguments = {param1, param2, param3};
+        final Object[] messageArguments = {param1, param2};
         // Create a new MessageFormat to ensure thread safety.
         // Sharing a MessageFormat and using applyPattern is not thread safe
         MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
@@ -201,23 +201,23 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return TRANSFER_MASTER_LOG_HIERARCHY;
+                return REMOVED_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1009 : The quorum override attribute of node ''{0}'' from the replication group ''{1}'' is set to ''{2}''.</pre>
+     * <pre>HA-1006 : Left : Node : ''{0}'' ({1})</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage QUORUM_OVERRIDE_CHANGED(String param1, String param2, String param3)
+    public static LogMessage LEFT(String param1, String param2)
     {
-        String rawMessage = _messages.getString("QUORUM_OVERRIDE_CHANGED");
+        String rawMessage = _messages.getString("LEFT");
 
-        final Object[] messageArguments = {param1, param2, param3};
+        final Object[] messageArguments = {param1, param2};
         // Create a new MessageFormat to ensure thread safety.
         // Sharing a MessageFormat and using applyPattern is not thread safe
         MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
@@ -233,21 +233,21 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY;
+                return LEFT_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1003 : The node ''{0}'' detached from the replication group ''{1}''.</pre>
+     * <pre>HA-1005 : Joined : Node : ''{0}'' ({1})</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage DETACHED(String param1, String param2)
+    public static LogMessage JOINED(String param1, String param2)
     {
-        String rawMessage = _messages.getString("DETACHED");
+        String rawMessage = _messages.getString("JOINED");
 
         final Object[] messageArguments = {param1, param2};
         // Create a new MessageFormat to ensure thread safety.
@@ -265,28 +265,23 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return DETACHED_LOG_HIERARCHY;
+                return JOINED_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1006 : A majority of nodes from replication group ''{0}'' is not available for node ''{1}''.</pre>
+     * <pre>HA-1001 : Created</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage MAJORITY_LOST(String param1, String param2)
+    public static LogMessage CREATED()
     {
-        String rawMessage = _messages.getString("MAJORITY_LOST");
+        String rawMessage = _messages.getString("CREATED");
 
-        final Object[] messageArguments = {param1, param2};
-        // Create a new MessageFormat to ensure thread safety.
-        // Sharing a MessageFormat and using applyPattern is not thread safe
-        MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
-
-        final String message = formatter.format(messageArguments);
+        final String message = rawMessage;
 
         return new LogMessage()
         {
@@ -297,28 +292,23 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return MAJORITY_LOST_LOG_HIERARCHY;
+                return CREATED_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1008 : The priority attribute of node ''{0}'' from the replication group ''{1}'' is set to ''{2}''.</pre>
+     * <pre>HA-1009 : Insufficient replicas contactable</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage PRIORITY_CHANGED(String param1, String param2, String param3)
+    public static LogMessage QUORUM_LOST()
     {
-        String rawMessage = _messages.getString("PRIORITY_CHANGED");
+        String rawMessage = _messages.getString("QUORUM_LOST");
 
-        final Object[] messageArguments = {param1, param2, param3};
-        // Create a new MessageFormat to ensure thread safety.
-        // Sharing a MessageFormat and using applyPattern is not thread safe
-        MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
-
-        final String message = formatter.format(messageArguments);
+        final String message = rawMessage;
 
         return new LogMessage()
         {
@@ -329,23 +319,23 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return PRIORITY_CHANGED_LOG_HIERARCHY;
+                return QUORUM_LOST_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1004 : The node ''{0}'' attached to the replication group ''{1}'' with role ''{2}''.</pre>
+     * <pre>HA-1012 : Priority  : {0}</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage ATTACHED(String param1, String param2, String param3)
+    public static LogMessage PRIORITY_CHANGED(String param1)
     {
-        String rawMessage = _messages.getString("ATTACHED");
+        String rawMessage = _messages.getString("PRIORITY_CHANGED");
 
-        final Object[] messageArguments = {param1, param2, param3};
+        final Object[] messageArguments = {param1};
         // Create a new MessageFormat to ensure thread safety.
         // Sharing a MessageFormat and using applyPattern is not thread safe
         MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
@@ -361,14 +351,14 @@ public class HighAvailabilityMessages
 
             public String getLogHierarchy()
             {
-                return ATTACHED_LOG_HIERARCHY;
+                return PRIORITY_CHANGED_LOG_HIERARCHY;
             }
         };
     }
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1001 : A new node ''{0}'' is added into a replication group ''{1}''.</pre>
+     * <pre>HA-1003 : Added : Node : ''{0}'' ({1})</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
@@ -400,21 +390,16 @@ public class HighAvailabilityMessages
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1002 : An existing node ''{0}'' is removed from the replication group ''{1}''.</pre>
+     * <pre>HA-1002 : Deleted</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage DELETED(String param1, String param2)
+    public static LogMessage DELETED()
     {
         String rawMessage = _messages.getString("DELETED");
 
-        final Object[] messageArguments = {param1, param2};
-        // Create a new MessageFormat to ensure thread safety.
-        // Sharing a MessageFormat and using applyPattern is not thread safe
-        MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
-
-        final String message = formatter.format(messageArguments);
+        final String message = rawMessage;
 
         return new LogMessage()
         {
@@ -432,7 +417,7 @@ public class HighAvailabilityMessages
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1005 : The role of the node ''{0}'' from the replication group ''{1}'' has changed from ''{2}'' to ''{3}''.</pre>
+     * <pre>HA-1010 : Role change reported: Node : ''{0}'' ({1}) : from ''{2}'' to ''{3}''</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
@@ -464,16 +449,16 @@ public class HighAvailabilityMessages
 
     /**
      * Log a HighAvailability message of the Format:
-     * <pre>HA-1010 : The designated primary attribute of node ''{0}'' from the replication group ''{1}'' is set to ''{2}''.</pre>
+     * <pre>HA-1013 : Designated primary : {0}</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage DESIGNATED_PRIMARY_CHANGED(String param1, String param2, String param3)
+    public static LogMessage DESIGNATED_PRIMARY_CHANGED(String param1)
     {
         String rawMessage = _messages.getString("DESIGNATED_PRIMARY_CHANGED");
 
-        final Object[] messageArguments = {param1, param2, param3};
+        final Object[] messageArguments = {param1};
         // Create a new MessageFormat to ensure thread safety.
         // Sharing a MessageFormat and using applyPattern is not thread safe
         MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailability_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailability_logmessages.properties
index 94df7cc38b..3c5b0d260f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailability_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailability_logmessages.properties
@@ -18,18 +18,47 @@
 #
 
 # HA logging message i18n strings.
-ADDED=HA-1001 : A new node ''{0}'' is added into a replication group ''{1}''.
-DELETED=HA-1002 : An existing node ''{0}'' is removed from the replication group ''{1}''.
-DETACHED=HA-1003 : The node ''{0}'' detached from the replication group ''{1}''.
-ATTACHED=HA-1004 : The node ''{0}'' attached to the replication group ''{1}'' with role ''{2}''.
-ROLE_CHANGED=HA-1005 : The role of the node ''{0}'' from the replication group ''{1}'' has changed from ''{2}'' to ''{3}''.
-MAJORITY_LOST=HA-1006 : A majority of nodes from replication group ''{0}'' is not available for node ''{1}''.
-INTRUDER_DETECTED=HA-1007: Intruder node ''{0}'' from ''{1}'' is detected in replication group ''{2}''
-PRIORITY_CHANGED=HA-1008 : The priority attribute of node ''{0}'' from the replication group ''{1}'' is set to ''{2}''.
-QUORUM_OVERRIDE_CHANGED=HA-1009 : The quorum override attribute of node ''{0}'' from the replication group ''{1}'' is set to ''{2}''.
-DESIGNATED_PRIMARY_CHANGED=HA-1010 : The designated primary attribute of node ''{0}'' from the replication group ''{1}'' is set to ''{2}''.
-STOPPED=HA-1011 : The node ''{0}'' from the replication group ''{1}'' is stopped.
-STARTED=HA-1012 : The node ''{0}'' from the replication group ''{1}'' is started.
-TRANSFER_MASTER=HA-1013 : Transfer master to ''{0}'' is requested on node ''{1}'' from the replication group ''{2}''.
+CREATED = HA-1001 : Created
+DELETED = HA-1002 : Deleted
+
+# 0 - Node name
+# 1 - Node address
+ADDED = HA-1003 : Added : Node : ''{0}'' ({1})
+
+# 0 - Node name
+# 1 - Node address
+REMOVED = HA-1004 : Removed : Node : ''{0}'' ({1})
+
+# 0 - Node name
+# 1 - Node address
+JOINED = HA-1005 : Joined : Node : ''{0}'' ({1})
+
+# 0 - Node name
+# 1 - Node address
+LEFT = HA-1006 : Left : Node : ''{0}'' ({1})
+
+# 0 - Node name
+# 1 - Node address
+TRANSFER_MASTER = HA-1007 : Master transfer requested : to ''{0}'' ({1})
+
+# 0 - Node name
+# 1 - Node address
+INTRUDER_DETECTED = HA-1008 : Intruder detected : Node ''{0}'' ({1})
+QUORUM_LOST = HA-1009 : Insufficient replicas contactable
+
+# 0 - Node name
+# 1 - Node address
+# 2 - Previous role value
+# 3 - New role value
+ROLE_CHANGED = HA-1010 : Role change reported: Node : ''{0}'' ({1}) : from ''{2}'' to ''{3}''
+
+# 0 - new value
+QUORUM_OVERRIDE_CHANGED = HA-1011 : Minimum group  : {0}
+
+# 0 - new value
+PRIORITY_CHANGED = HA-1012 : Priority  : {0}
+
+# 0 - new value
+DESIGNATED_PRIMARY_CHANGED = HA-1013 : Designated primary : {0}
 
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
index edb78369ae..d59a09fce9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
@@ -116,5 +116,4 @@ public class LogSubjectFormat
      */
     public static final String QUEUE_FORMAT = "vh(/{0})/qu({1})";
 
-    public static final String VIRTUAL_HOST_NODE_FORMAT = "vhn(/{0}))";
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/VirtualHostNodeLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/VirtualHostNodeLogSubject.java
deleted file mode 100644
index fad9a91841..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/VirtualHostNodeLogSubject.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.logging.subjects;
-
-import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.VIRTUAL_HOST_NODE_FORMAT;
-
-import org.apache.qpid.server.model.VirtualHostNode;
-
-public class VirtualHostNodeLogSubject extends AbstractLogSubject
-{
-    public VirtualHostNodeLogSubject(String nodeName)
-    {
-        setLogStringWithFormat(VIRTUAL_HOST_NODE_FORMAT, nodeName);
-    }
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
index 38101525cd..ad9df793c8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
@@ -24,7 +24,6 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
 import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
-import org.apache.qpid.server.logging.subjects.VirtualHostNodeLogSubject;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -54,7 +53,6 @@ public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<
     private final Broker<?> _broker;
     private final AtomicReference<State> _state = new AtomicReference<State>(State.UNINITIALIZED);
     private final EventLogger _eventLogger;
-    private final VirtualHostNodeLogSubject _virtualHostNodeLogSubject;
 
     private DurableConfigurationStore _durableConfigurationStore;
 
@@ -67,7 +65,6 @@ public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<
         _broker = parent;
         SystemConfig<?> systemConfig = _broker.getParent(SystemConfig.class);
         _eventLogger = systemConfig.getEventLogger();
-        _virtualHostNodeLogSubject = new VirtualHostNodeLogSubject(getName());
     }
 
 
@@ -248,8 +245,4 @@ public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<
 
     protected abstract void activate();
 
-    public VirtualHostNodeLogSubject getVirtualHostNodeLogSubject()
-    {
-        return _virtualHostNodeLogSubject;
-    }
 }