You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/02/19 09:40:35 UTC
[1/3] karaf-decanter git commit: Make sure scheduler tracks changes
in collectors
Repository: karaf-decanter
Updated Branches:
refs/heads/DS-target 629395e78 -> fe8a0400a
Make sure scheduler tracks changes in collectors
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/f2e56cf4
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/f2e56cf4
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/f2e56cf4
Branch: refs/heads/DS-target
Commit: f2e56cf4a9c259f5cfb64332ba49a5bf882014be
Parents: 629395e
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Feb 19 09:37:10 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Feb 19 09:37:10 2016 +0100
----------------------------------------------------------------------
.../scheduler/simple/SimpleScheduler.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/f2e56cf4/scheduler/simple/src/main/java/org/apache/karaf/decanter/scheduler/simple/SimpleScheduler.java
----------------------------------------------------------------------
diff --git a/scheduler/simple/src/main/java/org/apache/karaf/decanter/scheduler/simple/SimpleScheduler.java b/scheduler/simple/src/main/java/org/apache/karaf/decanter/scheduler/simple/SimpleScheduler.java
index d06840e..0268264 100644
--- a/scheduler/simple/src/main/java/org/apache/karaf/decanter/scheduler/simple/SimpleScheduler.java
+++ b/scheduler/simple/src/main/java/org/apache/karaf/decanter/scheduler/simple/SimpleScheduler.java
@@ -27,6 +27,7 @@ import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,17 +74,21 @@ public class SimpleScheduler implements Runnable, Scheduler {
LOGGER.warn("Can't collect data", e);
}
}
- try {
- Thread.sleep(period);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- running.set(false);
- }
+ sleep();
}
LOGGER.debug("Decanter SimpleScheduler thread stopped ...");
}
+ private void sleep() {
+ try {
+ Thread.sleep(period);
+ } catch (InterruptedException e) {
+ running.set(false);
+ Thread.currentThread().interrupt();
+ }
+ }
+
@Override
public void stop() {
running.set(false);
@@ -107,7 +112,7 @@ public class SimpleScheduler implements Runnable, Scheduler {
return running.get() ? "Started" : "Stopped";
}
- @Reference(target="(decanter.collector.name=*)", cardinality=ReferenceCardinality.MULTIPLE)
+ @Reference(target="(decanter.collector.name=*)", cardinality=ReferenceCardinality.MULTIPLE, policy=ReferencePolicy.DYNAMIC)
public void setCollector(Runnable collector) {
this.collectors.add(collector);
}
[3/3] karaf-decanter git commit: [KARAF-4300] Set default to not
export packages
Posted by cs...@apache.org.
[KARAF-4300] Set default to not export packages
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/fe8a0400
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/fe8a0400
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/fe8a0400
Branch: refs/heads/DS-target
Commit: fe8a0400ae1460343352dc3e7d339d10af7d80f1
Parents: 6b96900
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Feb 19 09:40:12 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Feb 19 09:40:12 2016 +0100
----------------------------------------------------------------------
appender/camel/pom.xml | 9 ---------
appender/cassandra/pom.xml | 9 ---------
appender/elasticsearch-native-1.x/pom.xml | 9 ---------
appender/elasticsearch-native-2.x/pom.xml | 9 ---------
appender/jdbc/pom.xml | 9 ---------
appender/jms/pom.xml | 9 ---------
appender/kafka/pom.xml | 9 ---------
appender/log/pom.xml | 13 -------------
collector/file/pom.xml | 13 -------------
collector/jmx/pom.xml | 9 ---------
collector/log/pom.xml | 13 -------------
collector/rest/pom.xml | 8 --------
elasticsearch-1.x/pom.xml | 8 --------
elasticsearch-2.x/pom.xml | 8 --------
marshaller/json/pom.xml | 15 +--------------
pom.xml | 1 +
scheduler/simple/pom.xml | 8 --------
sla/camel/pom.xml | 8 --------
sla/checker/pom.xml | 8 --------
sla/email/pom.xml | 8 --------
sla/log/pom.xml | 12 ------------
21 files changed, 2 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/appender/camel/pom.xml
----------------------------------------------------------------------
diff --git a/appender/camel/pom.xml b/appender/camel/pom.xml
index a14946e..9743f45 100644
--- a/appender/camel/pom.xml
+++ b/appender/camel/pom.xml
@@ -44,15 +44,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.appender.camel</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/appender/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index 0b71068..d834174 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -134,15 +134,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.appender.cassandra</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/appender/elasticsearch-native-1.x/pom.xml
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-native-1.x/pom.xml b/appender/elasticsearch-native-1.x/pom.xml
index bb55c89..a1972c1 100644
--- a/appender/elasticsearch-native-1.x/pom.xml
+++ b/appender/elasticsearch-native-1.x/pom.xml
@@ -59,15 +59,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.appender.elasticsearch</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/appender/elasticsearch-native-2.x/pom.xml
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-native-2.x/pom.xml b/appender/elasticsearch-native-2.x/pom.xml
index dd61b24..9e88be7 100644
--- a/appender/elasticsearch-native-2.x/pom.xml
+++ b/appender/elasticsearch-native-2.x/pom.xml
@@ -59,15 +59,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.appender.elasticsearch</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/appender/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/appender/jdbc/pom.xml b/appender/jdbc/pom.xml
index 86ece70..be1ec28 100644
--- a/appender/jdbc/pom.xml
+++ b/appender/jdbc/pom.xml
@@ -58,15 +58,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.appender.jdbc</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/appender/jms/pom.xml
----------------------------------------------------------------------
diff --git a/appender/jms/pom.xml b/appender/jms/pom.xml
index 8758a1f..2fbb975 100644
--- a/appender/jms/pom.xml
+++ b/appender/jms/pom.xml
@@ -44,15 +44,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.appender.jms</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/appender/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/appender/kafka/pom.xml b/appender/kafka/pom.xml
index 3a28be9..ebdb19f 100644
--- a/appender/kafka/pom.xml
+++ b/appender/kafka/pom.xml
@@ -48,15 +48,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.appender.kafka</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/appender/log/pom.xml
----------------------------------------------------------------------
diff --git a/appender/log/pom.xml b/appender/log/pom.xml
index eb0a78d..205c299 100644
--- a/appender/log/pom.xml
+++ b/appender/log/pom.xml
@@ -33,17 +33,4 @@
<packaging>bundle</packaging>
<name>Apache Karaf :: Decanter :: Appender :: Log</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.appender.log</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/collector/file/pom.xml
----------------------------------------------------------------------
diff --git a/collector/file/pom.xml b/collector/file/pom.xml
index bc8c349..8e623e0 100644
--- a/collector/file/pom.xml
+++ b/collector/file/pom.xml
@@ -41,17 +41,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.collector.file</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/collector/jmx/pom.xml
----------------------------------------------------------------------
diff --git a/collector/jmx/pom.xml b/collector/jmx/pom.xml
index 7c159dc..0e12169 100644
--- a/collector/jmx/pom.xml
+++ b/collector/jmx/pom.xml
@@ -36,15 +36,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.collector.jmx</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/collector/log/pom.xml
----------------------------------------------------------------------
diff --git a/collector/log/pom.xml b/collector/log/pom.xml
index d169587..cf274d6 100644
--- a/collector/log/pom.xml
+++ b/collector/log/pom.xml
@@ -41,17 +41,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.collector.log</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/collector/rest/pom.xml
----------------------------------------------------------------------
diff --git a/collector/rest/pom.xml b/collector/rest/pom.xml
index 81bcf42..59ebe8c 100644
--- a/collector/rest/pom.xml
+++ b/collector/rest/pom.xml
@@ -24,14 +24,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/elasticsearch-1.x/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-1.x/pom.xml b/elasticsearch-1.x/pom.xml
index 1cb44f7..e9f394c 100644
--- a/elasticsearch-1.x/pom.xml
+++ b/elasticsearch-1.x/pom.xml
@@ -44,14 +44,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/elasticsearch-2.x/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.x/pom.xml b/elasticsearch-2.x/pom.xml
index ac74e0d..7375093 100644
--- a/elasticsearch-2.x/pom.xml
+++ b/elasticsearch-2.x/pom.xml
@@ -44,14 +44,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/marshaller/json/pom.xml
----------------------------------------------------------------------
diff --git a/marshaller/json/pom.xml b/marshaller/json/pom.xml
index 8b64e7c..9a090fd 100644
--- a/marshaller/json/pom.xml
+++ b/marshaller/json/pom.xml
@@ -42,18 +42,5 @@
<artifactId>johnzon-mapper</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>org.apache.karaf.decanter.marshaller.json</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ad82579..95c9c79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,6 +213,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>!*</Export-Package>
<_dsannotations>*</_dsannotations>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/scheduler/simple/pom.xml
----------------------------------------------------------------------
diff --git a/scheduler/simple/pom.xml b/scheduler/simple/pom.xml
index 8143ff9..670d467 100644
--- a/scheduler/simple/pom.xml
+++ b/scheduler/simple/pom.xml
@@ -43,14 +43,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/sla/camel/pom.xml
----------------------------------------------------------------------
diff --git a/sla/camel/pom.xml b/sla/camel/pom.xml
index 9651107..3db3ae0 100644
--- a/sla/camel/pom.xml
+++ b/sla/camel/pom.xml
@@ -44,14 +44,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/sla/checker/pom.xml
----------------------------------------------------------------------
diff --git a/sla/checker/pom.xml b/sla/checker/pom.xml
index 867d7b5..f78ad88 100644
--- a/sla/checker/pom.xml
+++ b/sla/checker/pom.xml
@@ -36,14 +36,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/sla/email/pom.xml
----------------------------------------------------------------------
diff --git a/sla/email/pom.xml b/sla/email/pom.xml
index 5bf3aa7..5c25564 100644
--- a/sla/email/pom.xml
+++ b/sla/email/pom.xml
@@ -44,14 +44,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fe8a0400/sla/log/pom.xml
----------------------------------------------------------------------
diff --git a/sla/log/pom.xml b/sla/log/pom.xml
index b4da436..b0a125d 100644
--- a/sla/log/pom.xml
+++ b/sla/log/pom.xml
@@ -33,16 +33,4 @@
<packaging>bundle</packaging>
<name>Apache Karaf :: Decanter :: SLA :: Log</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
[2/3] karaf-decanter git commit: Avoid flooding of the log in case of
repeated errors
Posted by cs...@apache.org.
Avoid flooding of the log in case of repeated errors
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/6b96900a
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/6b96900a
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/6b96900a
Branch: refs/heads/DS-target
Commit: 6b96900a2001d63835c94b574d2ae23c497c46b4
Parents: f2e56cf
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Feb 19 09:37:54 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Feb 19 09:37:54 2016 +0100
----------------------------------------------------------------------
.../decanter/collector/rest/RestCollector.java | 27 ++++++++++++++++----
1 file changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/6b96900a/collector/rest/src/main/java/org/apache/karaf/decanter/collector/rest/RestCollector.java
----------------------------------------------------------------------
diff --git a/collector/rest/src/main/java/org/apache/karaf/decanter/collector/rest/RestCollector.java b/collector/rest/src/main/java/org/apache/karaf/decanter/collector/rest/RestCollector.java
index 9c2b078..b322644 100644
--- a/collector/rest/src/main/java/org/apache/karaf/decanter/collector/rest/RestCollector.java
+++ b/collector/rest/src/main/java/org/apache/karaf/decanter/collector/rest/RestCollector.java
@@ -45,14 +45,16 @@ import org.slf4j.LoggerFactory;
public class RestCollector implements Runnable {
private final static Logger LOGGER = LoggerFactory.getLogger(RestCollector.class);
- private String type;
private URL url;
private String[] paths;
+ private String baseTopic;
private Dictionary<String, Object> properties;
private EventAdmin eventAdmin;
private Unmarshaller unmarshaller;
+ private boolean repeatedError;
+
@SuppressWarnings("unchecked")
@Activate
public void activate(ComponentContext context) throws MalformedURLException {
@@ -61,9 +63,11 @@ public class RestCollector implements Runnable {
getProperty(props, "username", null);
getProperty(props, "password", null);
this.paths = getProperty(props, "paths", "").split(",");
+ this.baseTopic = getProperty(props, "topic", "decanter/collect");
//props.remove("password");
//props.remove("username");
this.properties = props;
+ this.repeatedError = false;
}
private String getProperty(Dictionary<String, Object> properties, String key, String defaultValue) {
@@ -74,8 +78,14 @@ public class RestCollector implements Runnable {
public void run() {
LOGGER.debug("Karaf Decanter REST Collector starts harvesting from {} ...", url);
for (String path : paths) {
+ URL complete;
+ try {
+ complete = new URL(url, path);
+ } catch (MalformedURLException e) {
+ LOGGER.warn("Invalid URL. Stopping collector", e);
+ throw new IllegalArgumentException(e);
+ }
try {
- URL complete = new URL(url, path);
URLConnection connection = complete.openConnection();
Map<String, Object> data = unmarshaller.unmarshal(connection.getInputStream());
data.put("type", "rest");
@@ -83,15 +93,22 @@ public class RestCollector implements Runnable {
data.put("remote.url", complete);
addUserProperties(data);
eventAdmin.postEvent(new Event(toTopic(complete), data));
+ repeatedError = false;
} catch (Exception e) {
- LOGGER.warn("Error fetching", e);
+ if (repeatedError) {
+ LOGGER.warn("Error fetching " + complete, e);
+ repeatedError = true;
+ } else {
+ LOGGER.debug("Repeated Error fetching " + complete, e);
+ }
+
}
}
- LOGGER.debug("Karaf Decanter JMX Collector harvesting {} done", type);
+ LOGGER.debug("Karaf Decanter REST Collector harvesting done");
}
private String toTopic(URL url) {
- return "decanter/collect/rest/" + url.getHost() + url.getPath();
+ return baseTopic + "/" + url.getHost() + url.getPath();
}
private void addUserProperties(Map<String, Object> data) {