You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/10/31 11:48:54 UTC

git commit: Improved readability of topology message processor logs

Updated Branches:
  refs/heads/master ac0a49ef7 -> d3a9688d0


Improved readability of topology message processor logs


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d3a9688d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d3a9688d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d3a9688d

Branch: refs/heads/master
Commit: d3a9688d00bd520dc1c9b3a40b229aa9b10c87f0
Parents: ac0a49e
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Oct 31 16:18:46 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Oct 31 16:18:46 2013 +0530

----------------------------------------------------------------------
 .../topology/ClusterCreatedEventProcessor.java  | 15 +++++-----
 .../topology/ClusterRemovedEventProcessor.java  | 12 ++++----
 .../CompleteTopologyEventProcessor.java         |  5 ++--
 .../topology/InstanceSpawnedEventProcessor.java | 19 ++++++------
 .../topology/MemberActivatedEventProcessor.java | 31 +++++++++++++-------
 .../topology/MemberStartedEventProcessor.java   | 23 ++++++++-------
 .../topology/MemberSuspendedEventProcessor.java | 23 ++++++++-------
 .../MemberTerminatedEventProcessor.java         | 25 +++++++++-------
 .../topology/ServiceCreatedEventProcessor.java  |  4 +--
 .../topology/ServiceRemovedEventProcessor.java  |  4 +--
 10 files changed, 92 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedEventProcessor.java
index 767a65b..450d65b 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedEventProcessor.java
@@ -44,25 +44,24 @@ public class ClusterCreatedEventProcessor implements TopologyMessageProcessor {
             // Validate event against the existing topology
             Service service = topology.getService(event.getServiceName());
             if (service == null) {
-                throw new RuntimeException(String.format("Service %s does not exist",
+                throw new RuntimeException(String.format("Service does not exist: [service] %s",
                         event.getServiceName()));
             }
             if (service.clusterExists(event.getClusterId())) {
-                throw new RuntimeException(String.format("Cluster %s already exists in service %s",
-                        event.getClusterId(),
-                        event.getServiceName()));
+                throw new RuntimeException(String.format("Cluster already exists in service: [service] %s [cluster] %s",
+                        event.getServiceName(),
+                        event.getClusterId()));
             }
 
             // Apply changes to the topology
-            Cluster cluster = new Cluster(event.getServiceName(), event.getClusterId(),
-                    event.getAutoscalingPolicyName());
+            Cluster cluster = new Cluster(event.getServiceName(), event.getClusterId(), event.getAutoscalingPolicyName());
             cluster.setHostName(event.getHostName());
             cluster.setTenantRange(event.getTenantRange());
 
             service.addCluster(cluster);
             if (log.isInfoEnabled()) {
-                log.info(String.format("Cluster %s created for service %s",
-                        event.getClusterId(), event.getServiceName()));
+                log.info(String.format("Cluster created: [service] %s [cluster] %s",
+                         event.getServiceName(), event.getClusterId()));
             }
 
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedEventProcessor.java
index b390716..26160e7 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedEventProcessor.java
@@ -43,21 +43,21 @@ public class ClusterRemovedEventProcessor implements TopologyMessageProcessor {
             // Validate event against the existing topology
             Service service = topology.getService(event.getServiceName());
             if (service == null) {
-                throw new RuntimeException(String.format("Service %s does not exist",
+                throw new RuntimeException(String.format("Service does not exist: [service] %s",
                         event.getServiceName()));
             }
             if (!service.clusterExists(event.getClusterId())) {
-                throw new RuntimeException(String.format("Cluster %s does not exist in service %s",
-                        event.getClusterId(),
-                        event.getServiceName()));
+                throw new RuntimeException(String.format("Cluster does not exist: [service] %s [cluster] %s",
+                        event.getServiceName(),
+                        event.getClusterId()));
             }
 
             // Apply changes to the topology
             service.removeCluster(event.getClusterId());
 
             if (log.isInfoEnabled()) {
-                log.info(String.format("Cluster %s removed from service %s",
-                        event.getClusterId(), event.getServiceName()));
+                log.info(String.format("Cluster removed from service: [service] %s [cluster] %s",
+                         event.getServiceName(), event.getClusterId()));
             }
 
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyEventProcessor.java
index afe8606..2ddd630 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyEventProcessor.java
@@ -40,8 +40,9 @@ public class CompleteTopologyEventProcessor implements TopologyMessageProcessor
             // Parse complete message and build event
             CompleteTopologyEvent event = (CompleteTopologyEvent) Util.jsonToObject(message, CompleteTopologyEvent.class);
             topology.addServices(event.getTopology().getServices());
-            log.info("Topology initialized.");
-
+            if (log.isInfoEnabled()) {
+                log.info("Topology initialized");
+            }
             return true;
         } else {
             if (nextMsgProcessor != null) {

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedEventProcessor.java
index 144a632..c0de675 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedEventProcessor.java
@@ -43,19 +43,19 @@ public class InstanceSpawnedEventProcessor implements TopologyMessageProcessor {
             // Validate event against the existing topology
             Service service = topology.getService(event.getServiceName());
             if (service == null) {
-                throw new RuntimeException(String.format("Service %s does not exist",
+                throw new RuntimeException(String.format("Service does not exist: [service] %s",
                         event.getServiceName()));
             }
             Cluster cluster = service.getCluster(event.getClusterId());
             if (cluster == null) {
-                throw new RuntimeException(String.format("Cluster %s does not exist",
-                        event.getClusterId()));
+                throw new RuntimeException(String.format("Cluster does not exist: [service] %s [cluster] %s",
+                        event.getServiceName(), event.getClusterId()));
             }
             if (cluster.memberExists(event.getMemberId())) {
-                throw new RuntimeException(String.format("Member %s already exist in cluster %s of service %s",
-                        event.getMemberId(),
+                throw new RuntimeException(String.format("Member already exists: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
                         event.getClusterId(),
-                        event.getServiceName()));
+                        event.getMemberId()));
             }
 
             // Apply changes to the topology
@@ -64,9 +64,10 @@ public class InstanceSpawnedEventProcessor implements TopologyMessageProcessor {
             cluster.addMember(member);
 
             if (log.isInfoEnabled()) {
-                log.info(String.format("Member %s created in cluster %s of service %s",
-                        event.getMemberId(), event.getClusterId(),
-                        event.getServiceName()));
+                log.info(String.format("Member created: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
+                        event.getClusterId(),
+                        event.getMemberId()));
             }
 
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedEventProcessor.java
index 95bd45f..700f992 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedEventProcessor.java
@@ -47,24 +47,34 @@ public class MemberActivatedEventProcessor implements TopologyMessageProcessor {
             // Validate event against the existing topology
             Service service = topology.getService(event.getServiceName());
             if (service == null) {
-                throw new RuntimeException(String.format("Service %s does not exist", event.getServiceName()));
+                throw new RuntimeException(String.format("Service does not exist: [service] %s", event.getServiceName()));
             }
             Cluster cluster = service.getCluster(event.getClusterId());
             if (cluster == null) {
-                throw new RuntimeException(String.format("Cluster %s does not exist", event.getClusterId()));
+                throw new RuntimeException(String.format("Cluster does not exist: [service] %s [cluster] %s",
+                        event.getServiceName(), event.getClusterId()));
             }
             Member member = cluster.getMember(event.getMemberId());
             if (member == null) {
-                throw new RuntimeException(String.format("Member %s does not exist", event.getMemberId()));
+                throw new RuntimeException(String.format("Member does not exist: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
+                        event.getClusterId(),
+                        event.getMemberId()));
             }
             if (member.getStatus() == MemberStatus.Activated) {
-                throw new RuntimeException(String.format("Member %s of cluster %s of service %s is already activated",
-                        event.getMemberId(),
+                throw new RuntimeException(String.format("Member already activated: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
+                        event.getClusterId(),
+                        event.getMemberId()));
+            }
+            if((event.getMemberIp() == null) || event.getMemberIp().isEmpty()) {
+                throw new RuntimeException(String.format("No ip address found in member activated event: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
                         event.getClusterId(),
-                        event.getServiceName()));
+                        event.getMemberId()));
             }
             if ((event.getPorts() == null) || (event.getPorts().size() == 0)) {
-                throw new RuntimeException(String.format("No ports found in member activated event [service] %s [cluster-id] %s [member-id] %s",
+                throw new RuntimeException(String.format("No ports found in member activated event: [service] %s [cluster] %s [member] %s",
                         event.getServiceName(),
                         event.getClusterId(),
                         event.getMemberId()));
@@ -76,9 +86,10 @@ public class MemberActivatedEventProcessor implements TopologyMessageProcessor {
             member.setStatus(MemberStatus.Activated);
 
             if (log.isInfoEnabled()) {
-                log.info(String.format("Member %s activated in cluster %s of service %s",
-                        event.getMemberId(), event.getClusterId(),
-                        event.getServiceName()));
+                log.info(String.format("Member activated: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
+                        event.getClusterId(),
+                        event.getMemberId()));
             }
 
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedEventProcessor.java
index b774c31..373d713 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedEventProcessor.java
@@ -48,33 +48,36 @@ public class MemberStartedEventProcessor implements TopologyMessageProcessor {
 				// Validate event against the existing topology
 				Service service = topology.getService(event.getServiceName());
 				if (service == null) {
-					throw new RuntimeException(String.format("Service %s does not exist",
+					throw new RuntimeException(String.format("Service does not exist: [service] %s",
 					                                         event.getServiceName()));
 				}
 				Cluster cluster = service.getCluster(event.getClusterId());
 				if (cluster == null) {
-					throw new RuntimeException(String.format("Cluster %s does not exist",
-					                                         event.getClusterId()));
+					throw new RuntimeException(String.format("Cluster does not exist: [service] %s [cluster] %s",
+                                                             event.getServiceName(), event.getClusterId()));
 				}
                 Member member = cluster.getMember(event.getMemberId());
                 if (member == null) {
-                    throw new RuntimeException(String.format("Member %s does not exist",
+                    throw new RuntimeException(String.format("Member does not exist: [service] %s [cluster] %s [member] %s",
+                            event.getServiceName(),
+                            event.getClusterId(),
                             event.getMemberId()));
                 }
                 if (member.getStatus() == MemberStatus.Starting) {
-                    throw new RuntimeException(String.format("Member %s of cluster %s of service %s is already started",
-                            event.getMemberId(),
+                    throw new RuntimeException(String.format("Member already started: [service] %s [cluster] %s [member] %s",
+                            event.getServiceName(),
                             event.getClusterId(),
-                            event.getServiceName()));
+                            event.getMemberId()));
                 }
 
                 // Apply changes to the topology
                 member.setStatus(MemberStatus.Starting);
 
 				if (log.isInfoEnabled()) {
-					log.info(String.format("Member %s started in cluster %s of service %s",
-					                       event.getMemberId(), event.getClusterId(),
-					                       event.getServiceName()));
+					log.info(String.format("Member started: [service] %s [cluster] %s [member] %s",
+                            event.getServiceName(),
+                            event.getClusterId(),
+                            event.getMemberId()));
 				}
 
 				return true;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedEventProcessor.java
index 915b613..32ffec7 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedEventProcessor.java
@@ -47,33 +47,36 @@ public class MemberSuspendedEventProcessor implements TopologyMessageProcessor {
             // Validate event against the existing topology
             Service service = topology.getService(event.getServiceName());
             if (service == null) {
-                throw new RuntimeException(String.format("Service %s does not exist",
+                throw new RuntimeException(String.format("Service does not exist: [service] %s",
                         event.getServiceName()));
             }
             Cluster cluster = service.getCluster(event.getClusterId());
             if (cluster == null) {
-                throw new RuntimeException(String.format("Cluster %s does not exist",
-                        event.getClusterId()));
+                throw new RuntimeException(String.format("Cluster does not exist: [service] %s [cluster] %s",
+                        event.getServiceName(), event.getClusterId()));
             }
             Member member = cluster.getMember(event.getMemberId());
             if (member == null) {
-                throw new RuntimeException(String.format("Member %s does not exist",
+                throw new RuntimeException(String.format("Member does not exist: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
+                        event.getClusterId(),
                         event.getMemberId()));
             }
             if (member.getStatus() == MemberStatus.Suspended) {
-                throw new RuntimeException(String.format("Member %s of cluster %s of service %s is already suspended",
-                        event.getMemberId(),
+                throw new RuntimeException(String.format("Member already suspended: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
                         event.getClusterId(),
-                        event.getServiceName()));
+                        event.getMemberId()));
             }
 
             // Apply changes to the topology
             member.setStatus(MemberStatus.Suspended);
 
             if (log.isInfoEnabled()) {
-                log.info(String.format("Member %s suspended in cluster %s of service %s",
-                        event.getMemberId(), event.getClusterId(),
-                        event.getServiceName()));
+                log.info(String.format("Member suspended: [service] %s [cluster] %s [member] %s",
+                        event.getServiceName(),
+                        event.getClusterId(),
+                        event.getMemberId()));
             }
 
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedEventProcessor.java
index a615e31..bd8c235 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedEventProcessor.java
@@ -48,30 +48,35 @@ public class MemberTerminatedEventProcessor implements TopologyMessageProcessor
 				// Validate event against the existing topology
 				Service service = topology.getService(event.getServiceName());
 				if (service == null) {
-					throw new RuntimeException(String.format("Service %s does not exist", event.getServiceName()));
+					throw new RuntimeException(String.format("Service does not exist: [service] %s", event.getServiceName()));
 				}
 				Cluster cluster = service.getCluster(event.getClusterId());
 				if (cluster == null) {
-					throw new RuntimeException(String.format("Cluster %s does not exist", event.getClusterId()));
+					throw new RuntimeException(String.format("Cluster does not exist: [service] %s [cluster] %s",
+                            event.getServiceName(), event.getClusterId()));
 				}
 				Member member = cluster.getMember(event.getMemberId());
 				if (member == null) {
-					throw new RuntimeException(String.format("Member %s does not exist", event.getMemberId()));
+					throw new RuntimeException(String.format("Member does not exist: [service] %s [cluster] %s [member] %s",
+                            event.getServiceName(),
+                            event.getClusterId(),
+                            event.getMemberId()));
 				}
 				if (member.getStatus() == MemberStatus.Terminated) {
-					throw new RuntimeException(String.format("Member %s of cluster %s of service %s is already terminated",
-					                                         event.getMemberId(),
-					                                         event.getClusterId(),
-					                                         event.getServiceName()));
+					throw new RuntimeException(String.format("Member already terminated: [service] %s [cluster] %s [member] %s",
+                            event.getServiceName(),
+                            event.getClusterId(),
+                            event.getMemberId()));
 				}
 
 				// Apply changes to the topology
 				member.setStatus(MemberStatus.Terminated);
 				
 				if (log.isInfoEnabled()) {
-					log.info(String.format("Member %s terminated in cluster %s of service %s",
-					                       event.getMemberId(), event.getClusterId(),
-					                       event.getServiceName()));
+					log.info(String.format("Member terminated: [service] %s [cluster] %s [member] %s",
+                            event.getServiceName(),
+                            event.getClusterId(),
+                            event.getMemberId()));
 				}
 
 				return true;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedEventProcessor.java
index 4502146..94b95d5 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedEventProcessor.java
@@ -43,7 +43,7 @@ public class ServiceCreatedEventProcessor implements TopologyMessageProcessor {
 
             // Validate event against the existing topology
             if (topology.serviceExists(event.getServiceName())) {
-                throw new RuntimeException(String.format("Service %s already exists", event.getServiceName()));
+                throw new RuntimeException(String.format("Service already created: [service] %s", event.getServiceName()));
             }
 
             // Apply changes to the topology
@@ -51,7 +51,7 @@ public class ServiceCreatedEventProcessor implements TopologyMessageProcessor {
             topology.addService(service);
 
             if (log.isInfoEnabled()) {
-                log.info(String.format("Service %s created", event.getServiceName()));
+                log.info(String.format("Service created: [service] %s", event.getServiceName()));
             }
 
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d3a9688d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedEventProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedEventProcessor.java
index 0a951c2..cdf307c 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedEventProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedEventProcessor.java
@@ -44,7 +44,7 @@ public class ServiceRemovedEventProcessor implements TopologyMessageProcessor {
             // Validate event against the existing topology
             Service service = topology.getService(event.getServiceName());
             if (service == null) {
-                throw new RuntimeException(String.format("Service %s does not exist",
+                throw new RuntimeException(String.format("Service does not exist: [service] %s",
                         event.getServiceName()));
             }
 
@@ -52,7 +52,7 @@ public class ServiceRemovedEventProcessor implements TopologyMessageProcessor {
             topology.removeService(service);
 
             if (log.isInfoEnabled()) {
-                log.info(String.format("Service %s removed", event.getServiceName()));
+                log.info(String.format("Service removed: [service] %s", event.getServiceName()));
             }
             return true;