[rhq] Branch 'feature/hadoop-plugin' - modules/plugins

lkrejci lkrejci at fedoraproject.org
Thu Aug 2 12:46:44 UTC 2012


 modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 01392ca70374edaa22430f96400144d525f932c5
Author: Lukas Krejci <lkrejci at redhat.com>
Date:   Thu Aug 2 14:46:21 2012 +0200

    Correcting a merge conflict.

diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
index 28fd6a1..a246b13 100644
--- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
+++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java
@@ -75,13 +75,6 @@ public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<
         configurationDelegate = new HadoopServerConfigurationDelegate(context);
         this.operationsDelegate = new HadoopOperationsDelegate(context);
 
-        EventContext events = context.getEventContext();
-        if (events != null) {
-            File logFile = determineLogFile();
-            int interval = Integer.parseInt(context.getPluginConfiguration().getSimpleValue(LOG_POLLING_INTERVAL_PROPERTY, "60"));                        
-            events.registerEventPoller(new LogFileEventPoller(events, LOG_EVENT_TYPE, logFile, new Log4JLogEntryProcessor(LOG_EVENT_TYPE, logFile)), interval);
-        }
-        
         // percentage metrics obtained from Hadoop JMX api are from interval (0,100) and RHQ expects interval (0,1)
         Set<MeasurementDefinition> measDefinitions = context.getResourceType().getMetricDefinitions();
         percentageMeasurements = new HashMap<String, Boolean>(measDefinitions.size());




More information about the rhq-commits mailing list