brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [7/9] git commit: fix more of the explicit places where enrichers could be re-added on rebind
Date Fri, 01 Aug 2014 16:47:41 GMT
fix more of the explicit places where enrichers could be re-added on rebind


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6416d446
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6416d446
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6416d446

Branch: refs/heads/master
Commit: 6416d446196bdfb0e0723414e524fc0b673d8fa3
Parents: 5114552
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Jul 31 03:38:34 2014 -0400
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Jul 31 03:40:09 2014 -0400

----------------------------------------------------------------------
 .../brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java   | 7 ++++---
 .../entity/webapp/JavaWebAppSoftwareProcessImpl.java         | 8 ++++----
 .../java/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java  | 1 -
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6416d446/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
b/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
index 373dc29..0671678 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
@@ -328,6 +328,8 @@ public class CassandraNodeImpl extends SoftwareProcessImpl implements
CassandraN
         
         Entities.getRequiredUrlConfig(this, CASSANDRA_CONFIG_TEMPLATE_URL);
         Entities.getRequiredUrlConfig(this, CASSANDRA_RACKDC_CONFIG_TEMPLATE_URL);
+        
+        connectEnrichers();
     }
     
     private volatile JmxFeed jmxFeed;
@@ -464,15 +466,14 @@ public class CassandraNodeImpl extends SoftwareProcessImpl implements
CassandraN
                         }))
                 .build();
         
-        connectEnrichers();
+        jmxMxBeanFeed = JavaAppUtils.connectMXBeanSensors(this);
     }
-
+    
     protected void connectEnrichers() {
         connectEnrichers(Duration.TEN_SECONDS);
     }
     
     protected void connectEnrichers(Duration windowPeriod) {
-        jmxMxBeanFeed = JavaAppUtils.connectMXBeanSensors(this);
         JavaAppUtils.connectJavaAppServerPolicies(this);
 
         addEnricher(TimeWeightedDeltaEnricher.<Long>getPerSecondDeltaEnricher(this,
READ_COMPLETED, READS_PER_SECOND_LAST));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6416d446/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
index 2b6ab29..2ea3f48 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
@@ -64,13 +64,13 @@ public abstract class JavaWebAppSoftwareProcessImpl extends SoftwareProcessImpl
     }
 
     @Override
-    protected void connectSensors() {
-        super.connectSensors();
-
+    public void init() {
+        super.init();
+        
         WebAppServiceMethods.connectWebAppServerPolicies(this);
         JavaAppUtils.connectJavaAppServerPolicies(this);
     }
-
+    
     //just provide better typing
     public JavaWebAppDriver getDriver() {
         return (JavaWebAppDriver) super.getDriver();

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6416d446/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java
b/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java
index 8e3587d..ce8fdec 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/jetty/Jetty6ServerImpl.java
@@ -84,7 +84,6 @@ public class Jetty6ServerImpl extends JavaWebAppSoftwareProcessImpl implements
J
                     .build());
 
             jmxFeedMx = JavaAppUtils.connectMXBeanSensors(this);
-            JavaAppUtils.connectJavaAppServerPolicies(this);
         } else {
             // if not using JMX
             log.warn("Jetty running without JMX monitoring; limited visibility of service
available");


Mime
View raw message