Repository: stratos Updated Branches: refs/heads/master 4829f0627 -> 653684ebf
Reading network partition id from config without the condition of cep stat publishing enabled Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/653684eb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/653684eb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/653684eb Branch: refs/heads/master Commit: 653684ebf0752877c3f129505895b8dd38838f82 Parents: 4829f06 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Jun 4 08:02:05 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Jun 4 08:02:05 2015 +0530 ---------------------------------------------------------------------- .../load/balancer/conf/LoadBalancerConfiguration.java | 9 ++++++--- .../test/resources/sample/configuration/loadbalancer3.conf | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/653684eb/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java index 87a9cb3..0183405 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java @@ -367,6 +367,11 @@ public class LoadBalancerConfiguration { configuration.setMultiTenancyEnabled(Boolean.parseBoolean(multiTenancyEnabled)); } + + String networkPartitionId = loadBalancerNode.getProperty(Constants.CONF_PROPERTY_NETWORK_PARTITION_ID); + validateRequiredPropertyInNode(Constants.CONF_PROPERTY_NETWORK_PARTITION_ID, networkPartitionId, "loadbalancer"); + configuration.setNetworkPartitionId(networkPartitionId); + // Read topology service filter and topology cluster filter if (configuration.isTopologyEventListenerEnabled()) { String serviceFilter = loadBalancerNode.getProperty(Constants.CONF_PROPERTY_TOPOLOGY_SERVICE_FILTER); @@ -382,6 +387,7 @@ public class LoadBalancerConfiguration { if (StringUtils.isNotBlank(memberFilter)) { configuration.setTopologyMemberFilter(memberFilter); } + } // Read cep ip and port if cep stats publisher is enabled @@ -394,9 +400,6 @@ public class LoadBalancerConfiguration { validateRequiredPropertyInNode(Constants.CONF_PROPERTY_CEP_PORT, cepPort, "loadbalancer"); configuration.setCepPort(Integer.parseInt(cepPort)); - String networkPartitionId = loadBalancerNode.getProperty(Constants.CONF_PROPERTY_NETWORK_PARTITION_ID); - validateRequiredPropertyInNode(Constants.CONF_PROPERTY_NETWORK_PARTITION_ID, networkPartitionId, "loadbalancer"); - configuration.setNetworkPartitionId(networkPartitionId); } if (configuration.isMultiTenancyEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/653684eb/components/org.apache.stratos.load.balancer/src/test/resources/sample/configuration/loadbalancer3.conf ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/test/resources/sample/configuration/loadbalancer3.conf b/components/org.apache.stratos.load.balancer/src/test/resources/sample/configuration/loadbalancer3.conf index 461b494..2f723e8 100755 --- a/components/org.apache.stratos.load.balancer/src/test/resources/sample/configuration/loadbalancer3.conf +++ b/components/org.apache.stratos.load.balancer/src/test/resources/sample/configuration/loadbalancer3.conf @@ -88,7 +88,7 @@ loadbalancer { # Network partition id # Provide the network partition id if cep-stats-publisher is set to true. - # network-partition-id: network-partition-1; + network-partition-id: network-partition-1; # Multi-tenancy # If this property is set to true, all incoming request URLs will be scanned using the given tenant-identifier-regex
