You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/04 11:52:36 UTC
[1/2] git commit: Fixed issue of cep.stats.publisher.enabled system
property not being set properly
Updated Branches:
refs/heads/master 536376428 -> 46efc80cd
Fixed issue of cep.stats.publisher.enabled system property not being set properly
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b24c06dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b24c06dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b24c06dd
Branch: refs/heads/master
Commit: b24c06dd4eff70459086a162109c07ffa4e12615
Parents: 2da09be
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 4 15:15:30 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 4 15:15:30 2013 +0530
----------------------------------------------------------------------
.../balancer/common/statistics/WSO2CEPStatsPublisher.java | 10 ++++++----
.../balancer/internal/LoadBalancerServiceComponent.java | 7 ++-----
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b24c06dd/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/WSO2CEPStatsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/WSO2CEPStatsPublisher.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/WSO2CEPStatsPublisher.java
index 64a8121..cb24a2a 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/WSO2CEPStatsPublisher.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/WSO2CEPStatsPublisher.java
@@ -30,6 +30,7 @@ import org.wso2.carbon.databridge.commons.Event;
import org.wso2.carbon.utils.CarbonUtils;
import java.io.File;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -49,10 +50,8 @@ public class WSO2CEPStatsPublisher implements LoadBalancerStatsPublisher {
public WSO2CEPStatsPublisher() {
ip = System.getProperty("thrift.receiver.ip");
port = System.getProperty("thrift.receiver.port");
- String enabledStr = System.getProperty("load.balancer.cep.stats.publisher.enabled");
- if(StringUtils.isNotBlank(enabledStr)) {
- enabled = Boolean.getBoolean(enabledStr);
- }
+ enabled = Boolean.getBoolean("load.balancer.cep.stats.publisher.enabled");
+
if(enabled) {
init();
}
@@ -102,6 +101,9 @@ public class WSO2CEPStatsPublisher implements LoadBalancerStatsPublisher {
Object[] payload = new Object[]{entry.getKey(), entry.getValue()};
Event event = eventObject(null, null, payload, new HashMap<String, String>());
try {
+ if(log.isInfoEnabled()) {
+ log.info(String.format("Publishing statistics event: [stream] %s [version] %s [payload] %s", CALL_CENTER_DATA_STREAM, VERSION, Arrays.toString(payload)));
+ }
asyncDataPublisher.publish(CALL_CENTER_DATA_STREAM, VERSION, event);
} catch (AgentException e) {
log.error("Failed to publish events. ", e);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b24c06dd/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 ceb17cc..a3e46e9 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
@@ -108,6 +108,8 @@ public class LoadBalancerServiceComponent {
// Configure synapse settings
LoadBalancerConfiguration configuration = LoadBalancerConfiguration.getInstance();
SynapseConfigurator.configure(configuration);
+ // Configure cep settings
+ CEPConfigurator.configure(configuration);
if (configuration.isTopologyEventListenerEnabled()) {
// Configure jndi.properties
@@ -145,11 +147,6 @@ public class LoadBalancerServiceComponent {
}
}
- if(configuration.isCepStatsPublisherEnabled()) {
- // Configure cep related settings
- CEPConfigurator.configure(configuration);
- }
-
activated = true;
if (log.isDebugEnabled()) {
log.debug("LoadBalancerServiceComponent is activated ");
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/46efc80c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/46efc80c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/46efc80c
Branch: refs/heads/master
Commit: 46efc80cd7ba7fe6590e45a79c9f97406d71887a
Parents: b24c06d 5363764
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 4 16:22:29 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 4 16:22:29 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 130 +++++++
.../src/main/resources/AutoScalerService.wsdl | 359 +++++++++++++++++++
2 files changed, 489 insertions(+)
----------------------------------------------------------------------