Repository: stratos Updated Branches: refs/heads/master 56ecda7a2 -> 24906fc3b
Fix minor formatting issues Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/24906fc3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/24906fc3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/24906fc3 Branch: refs/heads/master Commit: 24906fc3b430b2e9d99db848de0d19dd323f4f73 Parents: 56ecda7 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri May 15 17:37:16 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri May 15 17:37:22 2015 +0530 ---------------------------------------------------------------------- .../LoadBalancerCommonTopologyEventReceiver.java | 4 ++-- .../statistics/LoadBalancerStatisticsReader.java | 2 ++ .../notifier/LoadBalancerStatisticsNotifier.java | 18 +++++++++--------- .../apache/stratos/mock/iaas/api/MockIaasApi.java | 1 + 4 files changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/24906fc3/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java index b6c7b7a..1202db2 100644 --- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java +++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java @@ -367,8 +367,8 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv private org.apache.stratos.load.balancer.common.domain.Service transformService(Service messagingService) { org.apache.stratos.load.balancer.common.domain.Service service = new org.apache.stratos.load.balancer.common.domain.Service(messagingService.getServiceName()); - if(messagingService.getPorts().size() > 0) { - for(Port messagingPort : messagingService.getPorts()) { + if (messagingService.getPorts().size() > 0) { + for (Port messagingPort : messagingService.getPorts()) { service.addPort(transformPort(messagingPort)); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/24906fc3/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java index 7e75d96..9cd0a76 100644 --- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java +++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java @@ -26,12 +26,14 @@ public interface LoadBalancerStatisticsReader { /** * Returns the cluster instance id if the load balancer is configured to serve a specific cluster instance. + * * @return */ String getClusterInstanceId(); /** * Returns in-flight request count of sliding window configured. + * * @param clusterId */ int getInFlightRequestCount(String clusterId); http://git-wip-us.apache.org/repos/asf/stratos/blob/24906fc3/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java index 8bfe227..dc2233d 100644 --- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java +++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java @@ -79,17 +79,17 @@ public class LoadBalancerStatisticsNotifier implements Runnable { String clusterInstanceId = statsReader.getClusterInstanceId(); for (Service service : topologyProvider.getTopology().getServices()) { for (Cluster cluster : service.getClusters()) { - // Publish in-flight request count of load balancer's network partition - int requestCount = statsReader.getInFlightRequestCount(cluster.getClusterId()); - inFlightRequestPublisher.publish(cluster.getClusterId(), clusterInstanceId, - networkPartitionId, requestCount); + // Publish in-flight request count of load balancer's network partition + int requestCount = statsReader.getInFlightRequestCount(cluster.getClusterId()); + inFlightRequestPublisher.publish(cluster.getClusterId(), clusterInstanceId, + networkPartitionId, requestCount); - if(log.isDebugEnabled()) { - log.debug(String.format("In-flight request count published to cep: [cluster-id] %s " + - "[cluster-instance-id] %s [network-partition] %s [value] %d ", - cluster.getClusterId(), clusterInstanceId, networkPartitionId, requestCount)); - } + if (log.isDebugEnabled()) { + log.debug(String.format("In-flight request count published to cep: [cluster-id] %s " + + "[cluster-instance-id] %s [network-partition] %s [value] %d ", + cluster.getClusterId(), clusterInstanceId, networkPartitionId, requestCount)); } + } } } else if (log.isWarnEnabled()) { log.warn("In-flight request count publisher is disabled"); http://git-wip-us.apache.org/repos/asf/stratos/blob/24906fc3/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java index ff8222f..51adad8 100644 --- a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java +++ b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java @@ -161,6 +161,7 @@ public class MockIaasApi { /** * Get mock iaas service instance + * * @return */ private MockIaasService getMockIaasService() {
