1
0
Эх сурвалжийг харах

Logging: Add log4j-extras dependency

Close #7927
Philip McMahon 11 жил өмнө
parent
commit
4194a699c0

+ 10 - 2
pom.xml

@@ -301,6 +301,14 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>apache-log4j-extras</artifactId>
+            <version>1.2.17</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -932,7 +940,7 @@
                                 </data>
                                 <data>
                                     <src>${project.build.directory}/lib</src>
-                                    <includes>lucene*, log4j*, jna*, spatial4j*, jts*, groovy*</includes>
+                                    <includes>lucene*, *log4j*, jna*, spatial4j*, jts*, groovy*</includes>
                                     <type>directory</type>
                                     <mapper>
                                         <type>perm</type>
@@ -1128,7 +1136,7 @@
                                     <location>target/lib/</location>
                                     <includes>
                                         <include>lucene*</include>
-                                        <include>log4j*</include>
+                                        <include>*log4j*</include>
                                         <include>jna*</include>
                                         <include>spatial4j*</include>
                                         <include>jts*</include>

+ 1 - 0
src/main/assemblies/common-bin.xml

@@ -6,6 +6,7 @@
             <includes>
                 <include>org.apache.lucene:lucene*</include>
                 <include>log4j:log4j</include>
+                <include>log4j:apache-log4j-extras</include>
                 <include>net.java.dev.jna:jna</include>
                 <include>com.spatial4j:spatial4j</include>
                 <include>com.vividsolutions:jts</include>

+ 2 - 0
src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java

@@ -57,6 +57,8 @@ public class LogConfigurator {
             .put("ntevent", "org.apache.log4j.nt.NTEventLogAppender")
             .put("null", "org.apache.log4j.NullAppender")
             .put("rollingFile", "org.apache.log4j.RollingFileAppender")
+            .put("extrasRollingFile", "org.apache.log4j.rolling.RollingFileAppender")
+            .put("timeBased", "org.apache.log4j.rolling.TimeBasedRollingPolicy")
             .put("smtp", "org.apache.log4j.net.SMTPAppender")
             .put("socket", "org.apache.log4j.net.SocketAppender")
             .put("socketHub", "org.apache.log4j.net.SocketHubAppender")