AMBARI-16034. Incremental changes to LogSearch to bring it up to date in the trunk (Dharmesh Makwana via oleewere)

3 files changed, 17 insertions, 17 deletions

diff --git a/ambari-logsearch/ambari-logsearch-appender/src/main/java/org/apache/ambari/logsearch/appender/LogsearchConversion.java b/ambari-logsearch/ambari-logsearch-appender/src/main/java/org/apache/ambari/logsearch/appender/LogsearchConversion.java
index b9e75270b6..dbdfe6cd03 100644
--- a/ambari-logsearch/ambari-logsearch-appender/src/main/java/org/apache/ambari/logsearch/appender/LogsearchConversion.java
+++ b/ambari-logsearch/ambari-logsearch-appender/src/main/java/org/apache/ambari/logsearch/appender/LogsearchConversion.java
@@ -70,4 +70,10 @@ public class LogsearchConversion extends EnhancedPatternLayout {
     e.printStackTrace(pw);
     return sw.toString();
   }
+  
+  @Override
+  public boolean ignoresThrowable() {
+    //set false to ignore exception stacktrace
+    return false;
+  }
 }
diff --git a/ambari-logsearch/ambari-logsearch-appender/src/main/java/org/apache/ambari/logsearch/appender/LogsearchAppender.java b/ambari-logsearch/ambari-logsearch-appender/src/main/java/org/apache/ambari/logsearch/appender/LogsearchRollingFileAppender.java
index 4339a213d1..6a93db57b0 100644
--- a/ambari-logsearch/ambari-logsearch-appender/src/main/java/org/apache/ambari/logsearch/appender/LogsearchAppender.java
+++ b/ambari-logsearch/ambari-logsearch-appender/src/main/java/org/apache/ambari/logsearch/appender/LogsearchRollingFileAppender.java
@@ -19,16 +19,16 @@
 
 package org.apache.ambari.logsearch.appender;
 
-import org.apache.log4j.DailyRollingFileAppender;
 import org.apache.log4j.Layout;
 import org.apache.log4j.Logger;
+import org.apache.log4j.RollingFileAppender;
 import org.apache.log4j.spi.LoggingEvent;
 
-public class LogsearchAppender extends DailyRollingFileAppender {
-  private static Logger logger = Logger.getLogger(LogsearchAppender.class);
+public class LogsearchRollingFileAppender extends RollingFileAppender {
+  private static Logger logger = Logger.getLogger(LogsearchRollingFileAppender.class);
 
-  public LogsearchAppender() {
-    logger.debug("Initializing LogsearchAppender........... ");
+  public LogsearchRollingFileAppender() {
+    logger.trace("Initializing LogsearchRollingFileAppender........... ");
   }
 
   @Override
@@ -40,11 +40,4 @@ public class LogsearchAppender extends DailyRollingFileAppender {
   public void setLayout(Layout layout) {
     super.setLayout(layout);
   }
-
-  protected void subAppend(LoggingEvent event) {
-    this.qw.write(this.layout.format(event));
-    if (shouldFlush(event)) {
-      this.qw.flush();
-    }
-  }
 }
diff --git a/ambari-logsearch/ambari-logsearch-appender/src/test/resources/log4j.properties b/ambari-logsearch/ambari-logsearch-appender/src/test/resources/log4j.properties
index b51e87d662..78fb66b77b 100644
--- a/ambari-logsearch/ambari-logsearch-appender/src/test/resources/log4j.properties
+++ b/ambari-logsearch/ambari-logsearch-appender/src/test/resources/log4j.properties
@@ -13,11 +13,12 @@
 # log4j configuration used during build and unit tests
 
 # Root logger option
-log4j.rootLogger=ALL, logsearchJson
+log4j.rootLogger=INFO, logsearchJson
 
 # Redirect log messages to a logsearch json 
-log4j.appender.logsearchJson=org.apache.ambari.logsearch.appender.LogsearchAppender
-log4j.appender.logsearchJson.File=target/logsearch/log.json
-log4j.appender.logsearchJson.datePattern='.'yyyy-MM-dd
-log4j.appender.allLog.Append=true
+log4j.appender.logsearchJson=org.apache.ambari.logsearch.appender.LogsearchRollingFileAppender
+log4j.appender.logsearchJson.File=target/jsonlog/log.json
+log4j.appender.logsearchJson.maxFileSize=10MB
+log4j.appender.logsearchJson.maxBackupIndex=10
+log4j.appender.logsearchJson.Append=true
 log4j.appender.logsearchJson.layout=org.apache.ambari.logsearch.appender.LogsearchConversion
\ No newline at end of file