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

oleewere pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-infra.git


The following commit(s) were added to refs/heads/master by this push:
     new 65a45ca  AMBARI-24987 - Infra Manager: parse logs by Logsearch (#23)
65a45ca is described below

commit 65a45ca2471f4261f333642399c8a3d64c2adbf7
Author: kasakrisz <33458261+kasakr...@users.noreply.github.com>
AuthorDate: Wed Dec 5 11:09:56 2018 +0100

    AMBARI-24987 - Infra Manager: parse logs by Logsearch (#23)
    
    * AMBARI-24987 - Infra Manager: parse logs by Logsearch
    
    * AMBARI-24987 - Infra Manager: parse logs by Logsearch - ISO8601 datetime
---
 ambari-infra-manager/pom.xml                       | 15 +++++++++++++++
 ambari-infra-manager/src/main/resources/log4j2.xml |  2 +-
 pom.xml                                            |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ambari-infra-manager/pom.xml b/ambari-infra-manager/pom.xml
index 419ccd5..80dddb1 100644
--- a/ambari-infra-manager/pom.xml
+++ b/ambari-infra-manager/pom.xml
@@ -364,6 +364,10 @@
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-server</artifactId>
         </exclusion>
@@ -571,6 +575,17 @@
       <version>2.3.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-web</artifactId>
+      <version>${log4j2.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
+      <version>${log4j2.version}</version>
+    </dependency>
+
   </dependencies>
 
 </project>
diff --git a/ambari-infra-manager/src/main/resources/log4j2.xml 
b/ambari-infra-manager/src/main/resources/log4j2.xml
index d3db3d7..80819c8 100644
--- a/ambari-infra-manager/src/main/resources/log4j2.xml
+++ b/ambari-infra-manager/src/main/resources/log4j2.xml
@@ -24,7 +24,7 @@
       <Layout type="PatternLayout" pattern="%d{HH:mm:ss.SSS} [%t] %-5level 
%logger{36}:%L - %msg%n" />
     </Appender>
     <RollingFile name="File" fileName="${logging.file}" 
filePattern="${logging.file}-%i-%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36}:%L - 
%msg%n" />
+      <PatternLayout pattern="%d{ISO8601} [%t] %-5p %C{6} (%F:%L) - %m%n" />
       <Policies>
         <TimeBasedTriggeringPolicy />
         <SizeBasedTriggeringPolicy size="10 MB"/>
diff --git a/pom.xml b/pom.xml
index af47dc8..80c4877 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
     <zookeeper.version>3.4.6.2.3.0.0-2557</zookeeper.version>
     <ambari-metrics.version>2.7.0.0.0</ambari-metrics.version>
     <skipSurefireTests>false</skipSurefireTests>
+    <log4j2.version>2.10.0</log4j2.version>
   </properties>
 
   <licenses>

Reply via email to