[ambari] branch branch-2.7 updated: AMBARI-24386 - [Log Search] Input config validator unable to parse any log entry (#1923) (#1926)

[krisztiankasa]

This is an automated email from the ASF dual-hosted git repository.

krisztiankasa pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new de31cb0  AMBARI-24386 - [Log Search] Input config validator unable to 
parse any log entry (#1923) (#1926)
de31cb0 is described below

commit de31cb0cc6c0bd74b9861547d944d671f2d4d0ce
Author: kasakrisz <33458261+kasakr...@users.noreply.github.com>
AuthorDate: Wed Aug 1 07:07:47 2018 +0200

    AMBARI-24386 - [Log Search] Input config validator unable to parse any log 
entry (#1923) (#1926)
---
 .../apache/ambari/logfeeder/common/LogEntryParseTester.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogEntryParseTester.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogEntryParseTester.java
index 6fd4140..b000aed 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogEntryParseTester.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogEntryParseTester.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ambari.logfeeder.conf.LogEntryCacheConfig;
 import org.apache.ambari.logfeeder.conf.LogFeederProps;
 import org.apache.ambari.logfeeder.input.InputFileMarker;
 import org.apache.ambari.logfeeder.input.InputManagerImpl;
@@ -82,13 +83,20 @@ public class LogEntryParseTester {
     ConfigHandler configHandler = new ConfigHandler(null);
     configHandler.setInputManager(new InputManagerImpl());
     OutputManagerImpl outputManager = new OutputManagerImpl();
+    LogFeederProps logFeederProps = new LogFeederProps();
+    LogEntryCacheConfig logEntryCacheConfig = new LogEntryCacheConfig();
+    logEntryCacheConfig.setCacheEnabled(false);
+    logEntryCacheConfig.setCacheSize(0);
+    logFeederProps.setLogEntryCacheConfig(logEntryCacheConfig);
+    outputManager.setLogFeederProps(logFeederProps);
     LogLevelFilterHandler logLevelFilterHandler = new 
LogLevelFilterHandler(null);
-    logLevelFilterHandler.setLogFeederProps(new LogFeederProps());
+    logLevelFilterHandler.setLogFeederProps(logFeederProps);
     outputManager.setLogLevelFilterHandler(logLevelFilterHandler);
     configHandler.setOutputManager(outputManager);
     Input input = configHandler.getTestInput(inputConfig, logId);
+    input.init(logFeederProps);
     final Map<String, Object> result = new HashMap<>();
-    input.getFirstFilter().init(new LogFeederProps());
+    input.getFirstFilter().init(logFeederProps);
     input.addOutput(new Output<LogFeederProps, InputFileMarker>() {
       @Override
       public void init(LogFeederProps logFeederProperties) throws Exception {