Updated Branches: refs/heads/flume-1.5 d2d7d7f96 -> e371d565b
FLUME-2262. Log4j Appender should use timeStamp field not getTimestamp, which was not available in older log4j versions. (Brock Noland via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/e371d565 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/e371d565 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/e371d565 Branch: refs/heads/flume-1.5 Commit: e371d565bd179ab000b5cfd9d771b5b38fc19cc3 Parents: d2d7d7f Author: Hari Shreedharan <hshreedha...@apache.org> Authored: Mon Dec 9 15:12:47 2013 -0800 Committer: Hari Shreedharan <hshreedha...@apache.org> Committed: Mon Dec 9 15:14:55 2013 -0800 ---------------------------------------------------------------------- .../java/org/apache/flume/clients/log4jappender/Log4jAppender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/e371d565/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java ---------------------------------------------------------------------- diff --git a/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java b/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java index b07b189..7c483db 100644 --- a/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java +++ b/flume-ng-clients/flume-ng-log4jappender/src/main/java/org/apache/flume/clients/log4jappender/Log4jAppender.java @@ -135,7 +135,7 @@ public class Log4jAppender extends AppenderSkeleton { Map<String, String> hdrs = new HashMap<String, String>(); hdrs.put(Log4jAvroHeaders.LOGGER_NAME.toString(), event.getLoggerName()); hdrs.put(Log4jAvroHeaders.TIMESTAMP.toString(), - String.valueOf(event.getTimeStamp())); + String.valueOf(event.timeStamp)); //To get the level back simply use //LoggerEvent.toLevel(hdrs.get(Integer.parseInt(
