Repository: stratos Updated Branches: refs/heads/master 3ad91a89c -> d9089b550
Update meta data service - STRATOS-998 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/861a6903 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/861a6903 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/861a6903 Branch: refs/heads/master Commit: 861a69030150144bb1cae35f7cd378cccfd0220b Parents: 34726f2 Author: gayan <[email protected]> Authored: Mon Nov 24 19:11:50 2014 +0530 Committer: gayan <[email protected]> Committed: Mon Nov 24 19:11:50 2014 +0530 ---------------------------------------------------------------------- .../metadataservice/listener/TopologyAgent.java | 130 ------------------- .../listener/TopologyListener.java | 69 ---------- 2 files changed, 199 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/861a6903/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java deleted file mode 100644 index f39594a..0000000 --- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java +++ /dev/null @@ -1,130 +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.metadataservice.listener; - -import org.apache.commons.configuration.XMLConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.messaging.event.Event; -import org.apache.stratos.messaging.event.topology.MemberSuspendedEvent; -import org.apache.stratos.messaging.event.topology.MemberTerminatedEvent; -import org.apache.stratos.messaging.listener.topology.MemberSuspendedEventListener; -import org.apache.stratos.messaging.listener.topology.MemberTerminatedEventListener; -import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver; -import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; -import org.apache.stratos.metadataservice.registry.DataRegistryFactory; -import org.apache.stratos.metadataservice.util.ConfUtil; - -/** - * Cartridge agent runnable. - */ -public class TopologyAgent implements Runnable { - - private static final Log log = LogFactory.getLog(TopologyAgent.class); - - - @Override - public void run() { - if (log.isInfoEnabled()) { - log.info("Topology agent started"); - } - - // Start topology event receiver thread - registerTopologyEventListeners(); - - } - - /** - * Register the topology event listener - */ - private void registerTopologyEventListeners() { - final String defaultRegType = "carbon"; - - XMLConfiguration conf; - log.info("==================Starting topology event message receiver thread================="); - if (log.isDebugEnabled()) { - log.debug("Starting topology event message receiver thread"); - } - conf = ConfUtil.getInstance(null).getConfiguration(); - - final String registryType = - conf.getString("metadataservice.govenanceregistrytype", - defaultRegType); - - - TopologyEventReceiver topologyEventReceiver = new TopologyEventReceiver(); - - topologyEventReceiver.addEventListener(new MemberTerminatedEventListener() { - @Override - protected void onEvent(Event event) { - try { - log.info("Member terminated event received"); - TopologyManager.acquireReadLock(); - if (log.isDebugEnabled()) { - log.debug("Member terminated event received"); - } - MemberTerminatedEvent memberTerminatedEvent = (MemberTerminatedEvent) event; - if(log.isDebugEnabled()){ - log.debug("Terminated event :::::::::::::::::::: " + - memberTerminatedEvent.getServiceName()); - } - //DataRegistryFactory.getDataRegistryFactory(registryType).removeCartridgeMetaDataDetails("appA", "php"); - - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Error processing member terminated event", e); - } - } finally { - TopologyManager.releaseReadLock(); - } - } - }); - - topologyEventReceiver.addEventListener(new MemberSuspendedEventListener() { - @Override - protected void onEvent(Event event) { - try { - log.info("Member suspended event received"); - TopologyManager.acquireReadLock(); - if (log.isDebugEnabled()) { - log.debug("Member suspended event received"); - } - MemberSuspendedEvent memberSuspendedEvent = (MemberSuspendedEvent) event; - //TODO : Add the funtionalilty for the suspended event - - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Error processing member suspended event", e); - } - } finally { - TopologyManager.releaseReadLock(); - } - } - }); - - Thread thread = new Thread(topologyEventReceiver); - thread.start(); - if (log.isDebugEnabled()) { - log.info("Cartridge Agent topology receiver thread started"); - } - } - -} http://git-wip-us.apache.org/repos/asf/stratos/blob/861a6903/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java deleted file mode 100644 index 6c018b4..0000000 --- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java +++ /dev/null @@ -1,69 +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.metadataservice.listener; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class TopologyListener implements ServletContextListener { - - private static final Log log = LogFactory.getLog(TopologyListener.class); - - private TopologyAgent topologyThread = null; - private Thread thread = null; - - /** - * Initialization of the context - * @param arg0 ServletContextEvent - */ - @Override - public void contextInitialized(ServletContextEvent arg0) { - log.info("Topology literner started...."); - if (topologyThread == null) { - // load default agent - topologyThread = new TopologyAgent(); - if (log.isDebugEnabled()) { - log.debug("Loading default Cartridge Agent."); - } - } - // start agent - thread = new Thread(topologyThread); - thread.start(); - - } - - /** - * Destroy the context - * @param arg0 ServletContextEvent - */ - @Override - public void contextDestroyed(ServletContextEvent arg0) - { - thread.stop(); - } - - - -}
