You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/05/31 11:13:57 UTC
[ambari] branch trunk updated: AMBARI-23992. Log Feeder:
NullPointer during file check in. (#1423)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6bf1206 AMBARI-23992. Log Feeder: NullPointer during file check in. (#1423)
6bf1206 is described below
commit 6bf12068ca0e9bc6c1c997a9261359e6b374f305
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Thu May 31 13:13:54 2018 +0200
AMBARI-23992. Log Feeder: NullPointer during file check in. (#1423)
---
.../main/java/org/apache/ambari/logfeeder/input/InputFileMarker.java | 2 +-
.../src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java | 2 +-
.../src/main/java/org/apache/ambari/logfeeder/util/FileUtil.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFileMarker.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFileMarker.java
index d3d12bd..70b439e 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFileMarker.java
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFileMarker.java
@@ -37,7 +37,7 @@ public class InputFileMarker implements InputMarker {
this.base64FileKey = base64FileKey;
this.lineNumber = lineNumber;
properties.put("line_number", lineNumber);
- properties.put("base64_file_key", base64FileKey);
+ properties.put("file_key", base64FileKey);
}
@Override
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java
index 12a804d..6330dae 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java
@@ -486,7 +486,7 @@ public class OutputSolr extends Output<LogFeederProps, InputMarker> implements C
Level.ERROR);
}
}
- latestInputMarkers.put(outputData.inputMarker.getAllProperties().get("base64_file_key").toString(),
+ latestInputMarkers.put(outputData.inputMarker.getAllProperties().get("file_key").toString(),
outputData.inputMarker);
localBuffer.add(document);
}
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/FileUtil.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/FileUtil.java
index 14b0e0c..3270d29 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/FileUtil.java
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/FileUtil.java
@@ -121,7 +121,7 @@ public class FileUtil {
return files;
}
} catch (Exception e) {
- LOG.warn("Input file was not found by pattern (exception thrown); {}, message: {}", searchPath, e.getMessage());
+ LOG.info("Input file was not found by pattern (exception thrown); {}, message: {}", searchPath, e.getMessage());
}
} else {
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.