You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/12 18:50:03 UTC
[1/2] git commit: deleted unnecessary event listner in SM
Updated Branches:
refs/heads/master 30eb003e1 -> 622410e72
deleted unnecessary event listner in SM
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0e1b38ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0e1b38ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0e1b38ed
Branch: refs/heads/master
Commit: 0e1b38ed65499f3314cf32e9da39b2a0fb873496
Parents: 3e2d598
Author: Isuru <is...@wso2.com>
Authored: Thu Dec 12 23:19:30 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Dec 12 23:19:30 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/listener/TopologyEventListner.java | 40 --
.../processor/ClusterStatusEventProcessor.java | 164 -------
.../CompleteTopologyEventProcessor.java | 122 -----
.../processor/InstanceStatusEventProcessor.java | 452 -------------------
.../event/processor/TopologyEventProcessor.java | 33 --
.../processor/TopologyEventProcessorChain.java | 65 ---
6 files changed, 876 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0e1b38ed/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/TopologyEventListner.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/TopologyEventListner.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/TopologyEventListner.java
deleted file mode 100644
index 0ec88f2..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/TopologyEventListner.java
+++ /dev/null
@@ -1,40 +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.stratos.adc.mgt.listener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.topology.event.processor.TopologyEventProcessorChain;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-public class TopologyEventListner implements MessageListener {
-
- private static final Log log = LogFactory.getLog(TopologyEventListner.class);
-
- public TopologyEventListner() {
- }
-
- public void onMessage(Message message) {
-
- TopologyEventProcessorChain.getInstance().startProcessing(message);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0e1b38ed/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java
deleted file mode 100644
index 5dc50c1..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java
+++ /dev/null
@@ -1,164 +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.stratos.adc.mgt.topology.event.processor;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
-import org.apache.stratos.adc.mgt.topology.model.TopologyClusterInformationModel;
-import org.apache.stratos.adc.mgt.utils.PersistenceManager;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.event.topology.ClusterCreatedEvent;
-import org.apache.stratos.messaging.event.topology.ClusterRemovedEvent;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
-import org.apache.stratos.messaging.util.Constants;
-import org.apache.stratos.messaging.util.Util;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-
-public class ClusterStatusEventProcessor extends TopologyEventProcessor {
-
- private static final Log log = LogFactory.getLog(ClusterStatusEventProcessor.class);
-
- @Override
- public void process(Message message) {
-
- doProcessing(message);
- //go to next processor in the chain
- if(nextTopologyEventProcessor != null) {
- nextTopologyEventProcessor.process(message);
- }
- }
-
- private void doProcessing (Message message) {
-
- String messageType = null;
-
- try {
- messageType = message.getStringProperty(Constants.EVENT_CLASS_NAME);
-
- } catch (JMSException e) {
- log.error("Error in getting message type from received Message " + message.getClass().toString(), e);
- return;
- }
-
- log.info("Received Cluster Status message: " + messageType);
-
- if (ClusterCreatedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- ClusterCreatedEvent event = getClusterCreatedEvent(message);
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo =
- getCartridgeSubscriptionInfo(event.getClusterId());
-
- if (cartridgeSubscriptionInfo != null) {
-
- Cluster cluster;
- //acquire read lock
- TopologyManager.acquireReadLock();
- try {
- cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
- } finally {
- //release read lock
- TopologyManager.releaseReadLock();
- }
-
- //add the new cluster to the Topology Cluster Info. model
- TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
- cartridgeSubscriptionInfo.getCartridge(),
- cartridgeSubscriptionInfo.getAlias(),
- cluster);
- }
-
- } else if (ClusterRemovedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- ClusterRemovedEvent event = getClusterRemovedEvent(message);
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo =
- getCartridgeSubscriptionInfo(event.getClusterId());
-
- if (cartridgeSubscriptionInfo != null) {
- //remove the information from Topology Cluster Info. model
- TopologyClusterInformationModel.getInstance().removeCluster(cartridgeSubscriptionInfo.getTenantId(),
- cartridgeSubscriptionInfo.getCartridge(),
- cartridgeSubscriptionInfo.getAlias());
- }
- }
- }
-
- private ClusterCreatedEvent getClusterCreatedEvent (Message message) {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- ClusterCreatedEvent event = (ClusterCreatedEvent) Util.jsonToObject(json, ClusterCreatedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nHost name: " + event.getHostName() +
- "\nService name: " + event.getServiceName() + " ]");
- }
-
- return event;
- }
-
- private ClusterRemovedEvent getClusterRemovedEvent (Message message) {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- ClusterRemovedEvent event = (ClusterRemovedEvent) Util.jsonToObject(json, ClusterRemovedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nService name: " + event.getServiceName() + " ]");
- }
-
- return event;
- }
-
- private CartridgeSubscriptionInfo getCartridgeSubscriptionInfo (String clusterDomain) {
-
- try {
- return PersistenceManager.getSubscriptionFromClusterId(clusterDomain);
-
- } catch (Exception e) {
- log.error("Error getting subscription information for cluster " + clusterDomain, e);
- return null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0e1b38ed/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/CompleteTopologyEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/CompleteTopologyEventProcessor.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/CompleteTopologyEventProcessor.java
deleted file mode 100644
index c37355f..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/CompleteTopologyEventProcessor.java
+++ /dev/null
@@ -1,122 +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.stratos.adc.mgt.topology.event.processor;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
-import org.apache.stratos.adc.mgt.topology.model.TopologyClusterInformationModel;
-import org.apache.stratos.adc.mgt.utils.PersistenceManager;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.domain.topology.Service;
-import org.apache.stratos.messaging.event.topology.CompleteTopologyEvent;
-import org.apache.stratos.messaging.util.Constants;
-import org.apache.stratos.messaging.util.Util;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-import java.util.Collection;
-
-public class CompleteTopologyEventProcessor extends TopologyEventProcessor {
-
- private static final Log log = LogFactory.getLog(CompleteTopologyEventProcessor.class);
-
- @Override
- public void process(Message message) {
-
- doProcessing(message);
- //go to next processor in the chain
- if(nextTopologyEventProcessor != null) {
- nextTopologyEventProcessor.process(message);
- }
- }
-
- private void doProcessing (Message message) {
-
- String messageType = null;
-
- try {
- messageType = message.getStringProperty(Constants.EVENT_CLASS_NAME);
-
- } catch (JMSException e) {
- log.error("Error in getting message type from received Message " + message.getClass().toString(), e);
- return;
- }
-
- log.info("Received Complete Topology message: " + messageType);
-
- if (CompleteTopologyEvent.class.getName().equals(messageType)) {
- log.info("Received message: " + messageType);
-
- CompleteTopologyEvent event = getCompleteTopologyEvent(message);
- //get all services
- Collection<Service> serviceCollection = event.getTopology().getServices();
- //iterate through the services
- for (Service service : serviceCollection) {
- //get all clusters
- Collection<Cluster> clusterCollection = service.getClusters();
- //iterate through the clusters
- for (Cluster cluster : clusterCollection) {
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo =
- getCartridgeSubscriptionInfo(cluster.getClusterId());
-
- if(cartridgeSubscriptionInfo != null) {
- //add the information to Topology Cluster Info. model
- TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
- cartridgeSubscriptionInfo.getCartridge(),
- cartridgeSubscriptionInfo.getAlias(), cluster);
- }
- }
- }
- }
- }
-
- private CompleteTopologyEvent getCompleteTopologyEvent (Message message) {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- CompleteTopologyEvent event = (CompleteTopologyEvent) Util.jsonToObject(json, CompleteTopologyEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Services: " + event.getTopology().getServices().toString() + " ]");
- }
-
- return event;
- }
-
- private CartridgeSubscriptionInfo getCartridgeSubscriptionInfo (String clusterDomain) {
-
- try {
- return PersistenceManager.getSubscriptionFromClusterId(clusterDomain);
-
- } catch (Exception e) {
- log.error("Error getting subscription information for cluster " + clusterDomain, e);
- return null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0e1b38ed/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java
deleted file mode 100644
index 8a03b7a..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java
+++ /dev/null
@@ -1,452 +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.stratos.adc.mgt.topology.event.processor;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
-import org.apache.stratos.adc.mgt.topology.model.TopologyClusterInformationModel;
-import org.apache.stratos.adc.mgt.utils.PersistenceManager;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.event.topology.MemberActivatedEvent;
-import org.apache.stratos.messaging.event.topology.MemberStartedEvent;
-import org.apache.stratos.messaging.event.topology.MemberSuspendedEvent;
-import org.apache.stratos.messaging.event.topology.MemberTerminatedEvent;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
-import org.apache.stratos.messaging.util.Constants;
-import org.apache.stratos.messaging.util.Util;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-import java.util.HashMap;
-import java.util.Map;
-
-public class InstanceStatusEventProcessor extends TopologyEventProcessor {
-
- private static final Log log = LogFactory.getLog(InstanceStatusEventProcessor.class);
-
- private Map<String, Integer> clusterIdToActiveInstanceCountMap;
-
- public InstanceStatusEventProcessor() {
- clusterIdToActiveInstanceCountMap = new HashMap<String, Integer>();
- }
-
- @Override
- public void process(Message message) {
-
- //new InstanceStatusListenerThread(message).start();
- doProcessing(message);
- //go to next processor in the chain
- if(nextTopologyEventProcessor != null) {
- nextTopologyEventProcessor.process(message);
- }
- }
-
- private void doProcessing (Message message) {
-
- String messageType = null;
-
- try {
- messageType = message.getStringProperty(Constants.EVENT_CLASS_NAME);
-
- } catch (JMSException e) {
- log.error("Error in getting message type from received Message " + message.getClass().toString(), e);
- return;
- }
-
- log.info("Received Topology message: " + messageType);
-
- if (MemberStartedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- MemberStartedEvent event = getMemberStartedEvent(message);
- String clusterDomain = event.getClusterId();
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
-
- if(cartridgeSubscriptionInfo != null) {
-
- Cluster cluster;
- //acquire read lock
- TopologyManager.acquireReadLock();
- try {
- cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
- } finally {
- //release read lock
- TopologyManager.releaseReadLock();
- }
-
- TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
- cartridgeSubscriptionInfo.getCartridge(),
- cartridgeSubscriptionInfo.getAlias(), cluster);
- }
-
- }
- else if (MemberActivatedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- MemberActivatedEvent event = getMemberActivetedEvent(message);
- String clusterDomain = event.getClusterId();
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
-
- if(cartridgeSubscriptionInfo != null) {
-
- Cluster cluster;
- //acquire read lock
- TopologyManager.acquireReadLock();
- try {
- cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
- } finally {
- //release read lock
- TopologyManager.releaseReadLock();
- }
- //update the model
- TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
- cartridgeSubscriptionInfo.getCartridge(),
- cartridgeSubscriptionInfo.getAlias(), cluster);
- }
-
-
- } else if (MemberSuspendedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- MemberStartedEvent event = getMemberStartedEvent(message);
- String clusterDomain = event.getClusterId();
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
-
- if(cartridgeSubscriptionInfo != null) {
-
- Cluster cluster;
- //acquire read lock
- TopologyManager.acquireReadLock();
- try {
- cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
- } finally {
- //release read lock
- TopologyManager.releaseReadLock();
- }
- //update the model
- TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
- cartridgeSubscriptionInfo.getCartridge(),
- cartridgeSubscriptionInfo.getAlias(), cluster);
- }
-
- } else if (MemberTerminatedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- MemberStartedEvent event = getMemberStartedEvent(message);
- String clusterDomain = event.getClusterId();
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
-
- if(cartridgeSubscriptionInfo != null) {
-
- Cluster cluster;
- //acquire read lock
- TopologyManager.acquireReadLock();
- try {
- cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
- } finally {
- //release read lock
- TopologyManager.releaseReadLock();
- }
- //update the model
- TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
- cartridgeSubscriptionInfo.getCartridge(),
- cartridgeSubscriptionInfo.getAlias(), cluster);
- }
-
- } else {
- //cannot happen
- }
- }
-
- private MemberStartedEvent getMemberStartedEvent (Message message) {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- MemberStartedEvent event = (MemberStartedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nMember Id: " + event.getMemberId() +
- "\nService name: " + event.getServiceName() +
- "\nStatus: " + event.getStatus().name() + " ]");
- }
-
- return event;
- }
-
- private MemberActivatedEvent getMemberActivetedEvent (Message message) {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- MemberActivatedEvent event = (MemberActivatedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nMember Id: " + event.getMemberId() +
- "\nService name: " + event.getServiceName() +
- "\nIp: " + event.getMemberIp() + " ]");
- }
-
- return event;
- }
-
- private MemberSuspendedEvent getMemberSuspendedEvent (Message message) {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- MemberSuspendedEvent event = (MemberSuspendedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nMember Id: " + event.getMemberId() +
- "\nService name: " + event.getServiceName() + " ]");
- }
-
- return event;
- }
-
- private MemberTerminatedEvent getMemberTerminatedEvebt (Message message) {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- MemberTerminatedEvent event = (MemberTerminatedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nMember Id: " + event.getMemberId() +
- "\nService name: " + event.getServiceName() + " ]");
- }
-
- return event;
- }
-
- private CartridgeSubscriptionInfo getCartridgeSubscriptionInfo (String clusterDomain) {
-
- try {
- return PersistenceManager.getSubscriptionFromClusterId(clusterDomain);
-
- } catch (Exception e) {
- log.error("Error getting subscription information for cluster " + clusterDomain, e);
- return null;
- }
- }
-
- /**
- * Message Processing Thread class for InstanceStatusEventProcessor
- */
- /*private class InstanceStatusListenerThread extends Thread {
-
- Message message;
-
- public InstanceStatusListenerThread (Message message) {
- this.message = message;
- }
-
- public void run () {
-
- String messageType = null;
-
- try {
- messageType = message.getStringProperty(Constants.EVENT_CLASS_NAME);
-
- } catch (JMSException e) {
- log.error("Error in getting message type from received Message " + message.getClass().toString(), e);
- return;
- }
-
- if (MemberStartedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- MemberStartedEvent event = getMemberStartedEvent();
- String clusterDomain = event.getClusterId();
- CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
- if(cartridgeSubscriptionInfo != null) {
-
- }
-
- }
- else if (MemberActivatedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- MemberActivatedEvent event = getMemberActivetedEvent();
- String clusterDomain = event.getClusterId();
-
-
- } else if (MemberSuspendedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- MemberStartedEvent event = getMemberStartedEvent();
- String clusterDomain = event.getClusterId();
-
- } else if (MemberTerminatedEvent.class.getName().equals(messageType)) {
-
- log.info("Received message: " + messageType);
-
- MemberStartedEvent event = getMemberStartedEvent();
- String clusterDomain = event.getClusterId();
-
- } else {
- //cannot happen
- }
- }
-
- private MemberStartedEvent getMemberStartedEvent () {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- MemberStartedEvent event = (MemberStartedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nMember Id: " + event.getMemberId() +
- "\nService name: " + event.getServiceName() +
- "\nStatus: " + event.getStatus().name() + " ]");
- }
-
- return event;
- }
-
- private MemberActivatedEvent getMemberActivetedEvent () {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- MemberActivatedEvent event = (MemberActivatedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nMember Id: " + event.getMemberId() +
- "\nService name: " + event.getServiceName() +
- "\nIp: " + event.getMemberIp() + " ]");
- }
-
- return event;
- }
-
- private MemberSuspendedEvent getMemberSuspendedEvent () {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- MemberSuspendedEvent event = (MemberSuspendedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nMember Id: " + event.getMemberId() +
- "\nService name: " + event.getServiceName() + " ]");
- }
-
- return event;
- }
-
- private MemberTerminatedEvent getMemberTerminatedEvebt () {
-
- String json = null;
- try {
- json = ((TextMessage)message).getText();
-
- } catch (JMSException e) {
- log.error("Error in getting Json message type from received Message ", e);
- return null;
- }
- MemberTerminatedEvent event = (MemberTerminatedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
-
- if(log.isDebugEnabled()) {
- log.debug("Received message details: [ " +
- "Cluster Id: " + event.getClusterId() +
- "\nMember Id: " + event.getMemberId() +
- "\nService name: " + event.getServiceName() + " ]");
- }
-
- return event;
- }
-
- private CartridgeSubscriptionInfo getCartridgeSubscriptionInfo (String clusterDomain) {
-
- try {
- return PersistenceManager.getSubscriptionFromClusterId(clusterDomain);
-
- } catch (Exception e) {
- log.error("Error getting subscription information for cluster " + clusterDomain, e);
- return null;
- }
- }
- }*/
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0e1b38ed/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/TopologyEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/TopologyEventProcessor.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/TopologyEventProcessor.java
deleted file mode 100644
index f582d57..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/TopologyEventProcessor.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.stratos.adc.mgt.topology.event.processor;
-
-import javax.jms.Message;
-
-public abstract class TopologyEventProcessor {
-
- protected TopologyEventProcessor nextTopologyEventProcessor = null;
-
- public void setNext (TopologyEventProcessor nextTopologyEventProcessor) {
- this.nextTopologyEventProcessor = nextTopologyEventProcessor;
- }
-
- public abstract void process (Message message);
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0e1b38ed/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/TopologyEventProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/TopologyEventProcessorChain.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/TopologyEventProcessorChain.java
deleted file mode 100644
index 4b1b8d5..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/TopologyEventProcessorChain.java
+++ /dev/null
@@ -1,65 +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.stratos.adc.mgt.topology.event.processor;
-
-import javax.jms.Message;
-
-public class TopologyEventProcessorChain {
-
- private TopologyEventProcessor completeTopologyEventProcessor = null;
- private TopologyEventProcessor instanceStatusEventProcessor = null;
- private TopologyEventProcessor clusterStatusEventProcessor = null;
- private static TopologyEventProcessorChain topologyEventProcessorChain;
-
- private TopologyEventProcessorChain () {
- completeTopologyEventProcessor = new CompleteTopologyEventProcessor();
- instanceStatusEventProcessor = new InstanceStatusEventProcessor();
- clusterStatusEventProcessor = new ClusterStatusEventProcessor();
- }
-
- public static TopologyEventProcessorChain getInstance () {
-
- if(topologyEventProcessorChain == null) {
- synchronized (TopologyEventProcessorChain.class) {
- if(topologyEventProcessorChain == null) {
- topologyEventProcessorChain = new TopologyEventProcessorChain();
- }
- }
- }
-
- return topologyEventProcessorChain;
- }
-
- public void initProcessorChain () {
-
- //if any other topology event processors are added, link them as follows
- //instanceStatusEventProcessor.setNext(nextTopologyeventProcessor);
- //nextTopologyeventProcessor.setNext(null);
- completeTopologyEventProcessor.setNext(instanceStatusEventProcessor);
- instanceStatusEventProcessor.setNext(clusterStatusEventProcessor);
- clusterStatusEventProcessor.setNext(null);
- }
-
- public void startProcessing (Message message) {
- completeTopologyEventProcessor.process(message);
- }
-
-
-}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/622410e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/622410e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/622410e7
Branch: refs/heads/master
Commit: 622410e72b95f962f7f2af7351d411c3d5de1d80
Parents: 0e1b38e 30eb003
Author: Isuru <is...@wso2.com>
Authored: Thu Dec 12 23:19:46 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Dec 12 23:19:46 2013 +0530
----------------------------------------------------------------------
.../autoscaler/api/AutoScalerServiceImpl.java | 2 +-
.../autoscaler/policy/PolicyManager.java | 50 +++++++++++++-
.../stratos/autoscaler/util/AutoscalerUtil.java | 39 -----------
.../stratos/cli/RestCommandLineService.java | 4 ++
.../apache/stratos/cli/utils/CliConstants.java | 2 +-
.../conf/LoadBalancerConfiguration.java | 2 +-
.../health/stat/AverageLoadAverageEvent.java | 58 +++++++++++++++++
.../stat/AverageMemoryConsumptionEvent.java | 58 +++++++++++++++++
.../stat/AverageRequestsInFlightEvent.java | 58 +++++++++++++++++
.../health/stat/GradientOfLoadAverageEvent.java | 58 +++++++++++++++++
.../stat/GradientOfMemoryConsumptionEvent.java | 58 +++++++++++++++++
.../stat/GradientOfRequestsInFlightEvent.java | 58 +++++++++++++++++
.../stat/MemberAverageLoadAverageEvent.java | 50 ++++++++++++++
.../MemberAverageMemoryConsumptionEvent.java | 49 ++++++++++++++
.../event/health/stat/MemberFaultEvent.java | 68 ++++++++++++++++++++
.../stat/MemberGradientOfLoadAverageEvent.java | 50 ++++++++++++++
.../MemberGradientOfMemoryConsumptionEvent.java | 50 ++++++++++++++
...emberSecondDerivativeOfLoadAverageEvent.java | 50 ++++++++++++++
...econdDerivativeOfMemoryConsumptionEvent.java | 50 ++++++++++++++
.../SecondDerivativeOfLoadAverageEvent.java | 58 +++++++++++++++++
...econdDerivativeOfMemoryConsumptionEvent.java | 49 ++++++++++++++
...SecondDerivativeOfRequestsInFlightEvent.java | 58 +++++++++++++++++
22 files changed, 935 insertions(+), 44 deletions(-)
----------------------------------------------------------------------