Repository: stratos Updated Branches: refs/heads/master 3f51f07c3 -> 16cad1c30
adding a warn level log for MQTT connection loss callbask Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/16cad1c3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/16cad1c3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/16cad1c3 Branch: refs/heads/master Commit: 16cad1c30db79cf3ada83edcb2e9700ea04d0c0f Parents: 3f51f07 Author: Isuru Haththotuwa <[email protected]> Authored: Tue Nov 11 11:02:07 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Tue Nov 11 11:02:50 2014 +0530 ---------------------------------------------------------------------- .../application/ApplicationTopicReceiver.java | 2 +- .../controller/topology/TopologyBuilder.java | 4 +-- .../ApplicationTerminatedMessageProcessor.java | 29 +------------------- .../ApplicationsEventMessageListener.java | 2 +- .../ClusterStatusEventMessageListener.java | 5 +--- .../stat/HealthStatEventMessageListener.java | 2 +- .../InstanceNotifierEventMessageListener.java | 5 +--- .../InstanceStatusEventMessageListener.java | 5 +--- .../tenant/TenantEventMessageListener.java | 3 +- .../topology/TopologyEventMessageListener.java | 2 +- 10 files changed, 11 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/receiver/application/ApplicationTopicReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/receiver/application/ApplicationTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/receiver/application/ApplicationTopicReceiver.java index 58176d3..4ad51cc 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/receiver/application/ApplicationTopicReceiver.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/receiver/application/ApplicationTopicReceiver.java @@ -67,8 +67,8 @@ public class ApplicationTopicReceiver implements Runnable{ @Override protected void onEvent(Event event) { //Remove the application related data - log.info("ApplicationTerminatedEvent received for [application]"); ApplicationTerminatedEvent terminatedEvent = (ApplicationTerminatedEvent)event; + log.info("ApplicationTerminatedEvent received for [application] " + terminatedEvent.getAppId()); String appId = terminatedEvent.getAppId(); TopologyBuilder.handleApplicationClustersRemoved(appId, terminatedEvent.getClusterData()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index 2f94d0d..a14348c 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -198,6 +198,8 @@ public class TopologyBuilder { } // remove runtime data dataHolder.removeClusterContext(aClusterData.getClusterId()); + + log.info("Removed application [ " + appId + " ]'s Cluster [ " + aClusterData.getClusterId() + " ] from the topology"); } // persist runtime data changes persist(dataHolder); @@ -205,8 +207,6 @@ public class TopologyBuilder { log.info("No cluster data found for application " + appId + " to remove"); } - log.info("Application Cluster " + appId + " are removed from the topology"); - TopologyManager.updateTopology(topology); } finally { http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatedMessageProcessor.java index f9d2950..94b98a0 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationTerminatedMessageProcessor.java @@ -60,23 +60,12 @@ public class ApplicationTerminatedMessageProcessor extends MessageProcessor { jsonToObject(message, ApplicationTerminatedEvent.class); ApplicationsUpdater.acquireWriteLockForApplications(); - Set<ClusterDataHolder> clusterDataHolders = event.getClusterData(); - if (clusterDataHolders != null) { - for (ClusterDataHolder clusterData : clusterDataHolders) { - TopologyUpdater.acquireWriteLockForService(clusterData.getServiceType()); - } - } try { return doProcess(event, applications); } finally { ApplicationsUpdater.releaseWriteLockForApplications(); - if (clusterDataHolders != null) { - for (ClusterDataHolder clusterData : clusterDataHolders) { - TopologyUpdater.releaseWriteLockForService(clusterData.getServiceType()); - } - } } } else { @@ -101,26 +90,10 @@ public class ApplicationTerminatedMessageProcessor extends MessageProcessor { // check if an Application with same name exists in applications String appId = event.getAppId(); if (applications.applicationExists(appId)) { - log.warn("Application with id [ " + appId + " ] still exists in Topology, removing it"); + log.warn("Application with id [ " + appId + " ] still exists in Applications, removing it"); applications.removeApplication(appId); } - if (event.getClusterData() != null) { - // remove the Clusters from the Topology - for (ClusterDataHolder clusterData : event.getClusterData()) { - log.info("################################ TODO ################################"); -// Service service = applications.getService(clusterData.getServiceType()); -// if (service != null) { -// service.removeCluster(clusterData.getClusterId()); -// if (log.isDebugEnabled()) { -// log.debug("Removed the Cluster " + clusterData.getClusterId() + " from Topology"); -// } -// } else { -// log.warn("Service " + clusterData.getServiceType() + " not found in Topology!"); -// } - } - } - if (log.isDebugEnabled()) { log.debug("ApplicationRemovedMessageProcessor notifying listener "); } http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageListener.java index 08fce23..968123e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/applications/ApplicationsEventMessageListener.java @@ -41,7 +41,7 @@ public class ApplicationsEventMessageListener implements MqttCallback { @Override public void connectionLost(Throwable throwable) { - log.warn("Connection is lost", throwable); + log.warn("MQTT Connection is lost", throwable); } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java index 2c7e428..450c04e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java @@ -48,10 +48,7 @@ class ClusterStatusEventMessageListener implements MqttCallback { @Override public void connectionLost(Throwable err) { - if (log.isDebugEnabled()) { - log.debug("MQTT connection lost", err); - } - + log.warn("MQTT Connection is lost", err); } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java index aabc432..c608333 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java @@ -48,7 +48,7 @@ public class HealthStatEventMessageListener implements MqttCallback { @Override public void connectionLost(Throwable err) { - log.debug("MQTT connection lost", err); + log.warn("MQTT Connection is lost", err); } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java index 5203ce4..cbf84be 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java @@ -48,10 +48,7 @@ class InstanceNotifierEventMessageListener implements MqttCallback { @Override public void connectionLost(Throwable err) { - if (log.isDebugEnabled()) { - log.debug("MQTT connection lost" , err); - } - + log.warn("MQTT Connection is lost", err); } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java index 9b3d9c4..fb609da 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageListener.java @@ -48,10 +48,7 @@ class InstanceStatusEventMessageListener implements MqttCallback { @Override public void connectionLost(Throwable err) { - if (log.isDebugEnabled()) { - log.debug("MQTT connection lost", err); - } - + log.warn("MQTT Connection is lost", err); } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java index ad43d15..4e446ce 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java @@ -48,8 +48,7 @@ class TenantEventMessageListener implements MqttCallback { @Override public void connectionLost(Throwable arg0) { - // TODO Auto-generated method stub - + log.warn("MQTT Connection is lost", arg0); } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/16cad1c3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageListener.java index 54d43ce..020ba08 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageListener.java @@ -45,7 +45,7 @@ class TopologyEventMessageListener implements MqttCallback { @Override public void connectionLost(Throwable throwable) { - log.warn("Connection is lost", throwable); + log.warn("MQTT Connection is lost", throwable); } @Override
