You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/07/06 15:03:21 UTC
karaf-decanter git commit: [KARAF-5238] Add kibana collector lookup
timeout to avoid to block features installation
Repository: karaf-decanter
Updated Branches:
refs/heads/master 669775e39 -> 70c81bc21
[KARAF-5238] Add kibana collector lookup timeout to avoid to block features installation
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/70c81bc2
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/70c81bc2
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/70c81bc2
Branch: refs/heads/master
Commit: 70c81bc21e5edfd5aa02dbe84863a6017e9c7d0c
Parents: 669775e
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jul 6 17:02:50 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jul 6 17:02:50 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/decanter/kibana4/Activator.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/70c81bc2/kibana-4.x/src/main/java/org/apache/karaf/decanter/kibana4/Activator.java
----------------------------------------------------------------------
diff --git a/kibana-4.x/src/main/java/org/apache/karaf/decanter/kibana4/Activator.java b/kibana-4.x/src/main/java/org/apache/karaf/decanter/kibana4/Activator.java
index 291334a..cc8c023 100644
--- a/kibana-4.x/src/main/java/org/apache/karaf/decanter/kibana4/Activator.java
+++ b/kibana-4.x/src/main/java/org/apache/karaf/decanter/kibana4/Activator.java
@@ -165,6 +165,7 @@ public class Activator implements BundleActivator {
return false;
}
} catch (Exception e) {
+ LOGGER.warn("Can't check data", e);
return false;
}
}
@@ -286,12 +287,15 @@ public class Activator implements BundleActivator {
if (event.getFeature().getName().equalsIgnoreCase("decanter-collector-log")) {
LOGGER.info("Decanter Kibana detected installation of the decanter-collector-log feature");
// check if data has been appended
- while (!checkCollectedDataType("log*")) {
+ int i = 0;
+ while (!checkCollectedDataType("log*") && i < 10) {
try {
- Thread.sleep(10000);
+ LOGGER.info("Checking log collected data");
+ Thread.sleep(500);
} catch (Exception e) {
// nothing to do
}
+ i++;
}
updateIndex();
createLogDashboard();
@@ -299,12 +303,15 @@ public class Activator implements BundleActivator {
if (event.getFeature().getName().equalsIgnoreCase("decanter-collector-jmx")) {
LOGGER.info("Decanter Kibana detected installation of the decanter-collector-log feature");
// check if data has been appended
- while (!checkCollectedDataType("jmx*")) {
+ int i = 0;
+ while (!checkCollectedDataType("jmx*") && i < 10) {
try {
- Thread.sleep(10000);
+ LOGGER.info("Checking jmx collected data");
+ Thread.sleep(500);
} catch (Exception e) {
// nothing to do
}
+ i++;
}
updateIndex();
createSystemDashboard();