Updated Branches: refs/heads/master dc493ccf2 -> d35d164a8
Fixed topology filter configurator logic Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/07fd2ff4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/07fd2ff4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/07fd2ff4 Branch: refs/heads/master Commit: 07fd2ff4c4e2fadbe887acf6b69473ce8d4ea5bb Parents: 258ebf0 Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 18 15:00:27 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 18 15:00:27 2013 +0530 ---------------------------------------------------------------------- .../TopologyFilterConfigurator.java | 26 ++++++++++++++------ .../internal/LoadBalancerServiceComponent.java | 4 +++ 2 files changed, 23 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/07fd2ff4/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java index 59d8c2f..6ad42ca 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/TopologyFilterConfigurator.java @@ -19,6 +19,7 @@ package org.apache.stratos.load.balancer.conf.configurator; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.load.balancer.conf.LoadBalancerConfiguration; @@ -31,14 +32,25 @@ public class TopologyFilterConfigurator { private static final Log log = LogFactory.getLog(TopologyFilterConfigurator.class); public static void configure(LoadBalancerConfiguration configuration) { - System.setProperty(Constants.TOPOLOGY_SERVICE_FILTER, configuration.getTopologyServiceFilter()); - System.setProperty(Constants.TOPOLOGY_CLUSTER_FILTER, configuration.getTopologyClusterFilter()); - System.setProperty(Constants.TOPOLOGY_MEMBER_FILTER, configuration.getTopologyMemberFilter()); + String serviceFilter = configuration.getTopologyServiceFilter(); + if (StringUtils.isNotBlank(serviceFilter)) { + System.setProperty(Constants.TOPOLOGY_SERVICE_FILTER, serviceFilter); + } + + String clusterFilter = configuration.getTopologyClusterFilter(); + if (StringUtils.isNotBlank(clusterFilter)) { + System.setProperty(Constants.TOPOLOGY_CLUSTER_FILTER, clusterFilter); + } + + String memberFilter = configuration.getTopologyMemberFilter(); + if (StringUtils.isNotBlank(memberFilter)) { + System.setProperty(Constants.TOPOLOGY_MEMBER_FILTER, memberFilter); + } - if(log.isDebugEnabled()) { - log.debug(String.format("service filter: ", System.getProperty(Constants.TOPOLOGY_SERVICE_FILTER))); - log.debug(String.format("cluster filter: ", System.getProperty(Constants.TOPOLOGY_CLUSTER_FILTER))); - log.debug(String.format("member filter: ", System.getProperty(Constants.TOPOLOGY_MEMBER_FILTER))); + if (log.isDebugEnabled()) { + log.debug(String.format("Topology filter settings: [service-filter] %s", System.getProperty(Constants.TOPOLOGY_SERVICE_FILTER))); + log.debug(String.format("Topology filter settings: [cluster-filter] %s", System.getProperty(Constants.TOPOLOGY_CLUSTER_FILTER))); + log.debug(String.format("Topology filter settings: [member-filter] %s", System.getProperty(Constants.TOPOLOGY_MEMBER_FILTER))); } } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/07fd2ff4/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java index f5077df..2d11458 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java @@ -31,6 +31,7 @@ import org.apache.stratos.load.balancer.conf.LoadBalancerConfiguration; import org.apache.stratos.load.balancer.conf.configurator.CEPConfigurator; import org.apache.stratos.load.balancer.conf.configurator.JndiConfigurator; import org.apache.stratos.load.balancer.conf.configurator.SynapseConfigurator; +import org.apache.stratos.load.balancer.conf.configurator.TopologyFilterConfigurator; import org.apache.stratos.load.balancer.context.LoadBalancerContext; import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter; import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter; @@ -115,6 +116,9 @@ public class LoadBalancerServiceComponent { // Configure cep settings CEPConfigurator.configure(configuration); + // Configure topology filters + TopologyFilterConfigurator.configure(configuration); + if (configuration.isMultiTenancyEnabled()) { // Configure jndi.properties JndiConfigurator.configure(configuration);
