Formatting cluster status message processors and improving logs
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2b82b91f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2b82b91f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2b82b91f Branch: refs/heads/stratos-4.1.x Commit: 2b82b91faf9e0a5b7488ed5e68fc9cf62183b8bc Parents: 6b4be64 Author: Akila Perera <[email protected]> Authored: Sun Nov 29 23:55:03 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Mon Nov 30 00:33:46 2015 +0530 ---------------------------------------------------------------------- .../ClusterStatusClusterActivatedMessageProcessor.java | 10 +++++++--- .../ClusterStatusClusterInactivateMessageProcessor.java | 10 +++++++--- ...usterStatusClusterInstanceCreatedMessageProcessor.java | 10 +++++----- .../status/ClusterStatusClusterResetMessageProcessor.java | 10 +++++++--- .../ClusterStatusClusterTerminatedMessageProcessor.java | 10 +++++++--- .../ClusterStatusClusterTerminatingMessageProcessor.java | 10 +++++++--- 6 files changed, 40 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2b82b91f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterActivatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterActivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterActivatedMessageProcessor.java index 2815cb5..9b50982 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterActivatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterActivatedMessageProcessor.java @@ -24,7 +24,6 @@ import org.apache.stratos.messaging.event.cluster.status.ClusterStatusClusterAct import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.util.MessagingUtil; - public class ClusterStatusClusterActivatedMessageProcessor extends MessageProcessor { private static final Log log = LogFactory.getLog(ClusterStatusClusterActivatedMessageProcessor.class); private MessageProcessor nextProcessor; @@ -42,7 +41,10 @@ public class ClusterStatusClusterActivatedMessageProcessor extends MessageProces jsonToObject(message, ClusterStatusClusterActivatedEvent.class); if (log.isDebugEnabled()) { - log.debug("Received ClusterStatusClusterActivatedEvent: " + event.toString()); + log.debug(String.format( + "Received ClusterStatusClusterActivatedEvent: [application-id] %s, [cluster-id] %s, " + + "[cluster-instance-id] %s", event.getAppId(), event.getClusterId(), + event.getInstanceId())); } // Notify event listeners notifyEventListeners(event); @@ -51,7 +53,9 @@ public class ClusterStatusClusterActivatedMessageProcessor extends MessageProces if (nextProcessor != null) { return nextProcessor.process(type, message, object); } else { - throw new RuntimeException(String.format("Failed to process cluster activated message using available message processors: [type] %s [body] %s", type, message)); + throw new RuntimeException(String.format( + "Failed to process cluster activated message using available message processors: [type] %s " + + "[body] %s", type, message)); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/2b82b91f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInactivateMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInactivateMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInactivateMessageProcessor.java index 34f6dfc..b1b1642 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInactivateMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInactivateMessageProcessor.java @@ -24,7 +24,6 @@ import org.apache.stratos.messaging.event.cluster.status.ClusterStatusClusterIna import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.util.MessagingUtil; - public class ClusterStatusClusterInactivateMessageProcessor extends MessageProcessor { private static final Log log = LogFactory.getLog(ClusterStatusClusterInactivateMessageProcessor.class); private MessageProcessor nextProcessor; @@ -42,7 +41,10 @@ public class ClusterStatusClusterInactivateMessageProcessor extends MessageProce jsonToObject(message, ClusterStatusClusterInactivateEvent.class); if (log.isDebugEnabled()) { - log.debug("Received ClusterStatusClusterInactivateEvent: " + event.toString()); + log.debug(String.format( + "Received ClusterStatusClusterInactivateEvent: [application-id] %s, [cluster-id] %s, " + + "[cluster-instance-id] %s", event.getAppId(), event.getClusterId(), + event.getInstanceId())); } // Notify event listeners notifyEventListeners(event); @@ -51,7 +53,9 @@ public class ClusterStatusClusterInactivateMessageProcessor extends MessageProce if (nextProcessor != null) { return nextProcessor.process(type, message, object); } else { - throw new RuntimeException(String.format("Failed to process cluster activated message using available message processors: [type] %s [body] %s", type, message)); + throw new RuntimeException(String.format( + "Failed to process cluster activated message using available message processors: [type] %s " + + "[body] %s", type, message)); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/2b82b91f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInstanceCreatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInstanceCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInstanceCreatedMessageProcessor.java index f9b5705..3eb8ba0 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInstanceCreatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterInstanceCreatedMessageProcessor.java @@ -24,7 +24,6 @@ import org.apache.stratos.messaging.event.cluster.status.ClusterStatusClusterIns import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.util.MessagingUtil; - public class ClusterStatusClusterInstanceCreatedMessageProcessor extends MessageProcessor { private static final Log log = LogFactory.getLog(ClusterStatusClusterInstanceCreatedMessageProcessor.class); private MessageProcessor nextProcessor; @@ -41,9 +40,8 @@ public class ClusterStatusClusterInstanceCreatedMessageProcessor extends Message ClusterStatusClusterInstanceCreatedEvent event = (ClusterStatusClusterInstanceCreatedEvent) MessagingUtil. jsonToObject(message, ClusterStatusClusterInstanceCreatedEvent.class); - if (log.isDebugEnabled()) { - log.debug("Received ClusterStatusClusterInstanceCreatedEvent: " + event.toString()); - } + log.debug(String.format("Received ClusterStatusClusterInstanceCreatedEvent: [service] %s, [cluster-id] %s, " + + "[cluster-instance-id] %s", event.getServiceName(), event.getClusterId(), event.getInstanceId())); // Notify event listeners notifyEventListeners(event); return true; @@ -51,7 +49,9 @@ public class ClusterStatusClusterInstanceCreatedMessageProcessor extends Message if (nextProcessor != null) { return nextProcessor.process(type, message, object); } else { - throw new RuntimeException(String.format("Failed to process cluster created message using available message processors: [type] %s [body] %s", type, message)); + throw new RuntimeException(String.format( + "Failed to process cluster created message using available message processors: [type] %s " + + "[body] %s", type, message)); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/2b82b91f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterResetMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterResetMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterResetMessageProcessor.java index de1f7c3..d6044cd 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterResetMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterResetMessageProcessor.java @@ -24,7 +24,6 @@ import org.apache.stratos.messaging.event.cluster.status.ClusterStatusClusterRes import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.util.MessagingUtil; - public class ClusterStatusClusterResetMessageProcessor extends MessageProcessor { private static final Log log = LogFactory.getLog(ClusterStatusClusterResetMessageProcessor.class); private MessageProcessor nextProcessor; @@ -42,7 +41,10 @@ public class ClusterStatusClusterResetMessageProcessor extends MessageProcessor jsonToObject(message, ClusterStatusClusterResetEvent.class); if (log.isDebugEnabled()) { - log.debug("Received ClusterStatusClusterResettedEvent: " + event.toString()); + log.debug(String.format( + "Received ClusterStatusClusterResetEvent: [application-id] %s, [cluster-id] %s, " + + "[cluster-instance-id] %s", event.getAppId(), event.getClusterId(), + event.getInstanceId())); } // Notify event listeners notifyEventListeners(event); @@ -51,7 +53,9 @@ public class ClusterStatusClusterResetMessageProcessor extends MessageProcessor if (nextProcessor != null) { return nextProcessor.process(type, message, object); } else { - throw new RuntimeException(String.format("Failed to process cluster created message using available message processors: [type] %s [body] %s", type, message)); + throw new RuntimeException(String.format( + "Failed to process cluster created message using available message processors: [type] %s " + + "[body] %s", type, message)); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/2b82b91f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatedMessageProcessor.java index fca96f2..c027031 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatedMessageProcessor.java @@ -25,7 +25,6 @@ import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; - public class ClusterStatusClusterTerminatedMessageProcessor extends MessageProcessor { private static final Log log = LogFactory.getLog(ClusterStatusClusterTerminatedMessageProcessor.class); private MessageProcessor nextProcessor; @@ -43,7 +42,10 @@ public class ClusterStatusClusterTerminatedMessageProcessor extends MessageProce jsonToObject(message, ClusterStatusClusterTerminatedEvent.class); if (log.isDebugEnabled()) { - log.debug("Received ClusterStatusClusterTerminatedEvent: " + event.toString()); + log.debug(String.format( + "Received ClusterStatusClusterTerminatedEvent: [application-id] %s, [cluster-id] %s, " + + "[cluster-instance-id] %s", event.getAppId(), event.getClusterId(), + event.getInstanceId())); } TopologyManager.getTopology().removeFromClusterMap(event.getClusterId()); @@ -54,7 +56,9 @@ public class ClusterStatusClusterTerminatedMessageProcessor extends MessageProce if (nextProcessor != null) { return nextProcessor.process(type, message, object); } else { - throw new RuntimeException(String.format("Failed to process cluster activated message using available message processors: [type] %s [body] %s", type, message)); + throw new RuntimeException(String.format( + "Failed to process cluster activated message using available message processors: [type] %s " + + "[body] %s", type, message)); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/2b82b91f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatingMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatingMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatingMessageProcessor.java index 37cc77f..0ff8417 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatingMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusClusterTerminatingMessageProcessor.java @@ -24,7 +24,6 @@ import org.apache.stratos.messaging.event.cluster.status.ClusterStatusClusterTer import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.util.MessagingUtil; - public class ClusterStatusClusterTerminatingMessageProcessor extends MessageProcessor { private static final Log log = LogFactory.getLog(ClusterStatusClusterTerminatingMessageProcessor.class); private MessageProcessor nextProcessor; @@ -42,7 +41,10 @@ public class ClusterStatusClusterTerminatingMessageProcessor extends MessageProc jsonToObject(message, ClusterStatusClusterTerminatingEvent.class); if (log.isDebugEnabled()) { - log.debug("Received ClusterStatusClusterTerminatingEvent: " + event.toString()); + log.debug(String.format( + "Received ClusterStatusClusterTerminatingEvent: [application-id] %s, [cluster-id] %s, " + + "[cluster-instance-id] %s", event.getAppId(), event.getClusterId(), + event.getInstanceId())); } // Notify event listeners notifyEventListeners(event); @@ -51,7 +53,9 @@ public class ClusterStatusClusterTerminatingMessageProcessor extends MessageProc if (nextProcessor != null) { return nextProcessor.process(type, message, object); } else { - throw new RuntimeException(String.format("Failed to process cluster activated message using available message processors: [type] %s [body] %s", type, message)); + throw new RuntimeException(String.format( + "Failed to process cluster terminating message using available message processors: [type] %s " + + "[body] %s", type, message)); } } }
