0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2719 use ecs log format

Browse source
This commit is contained in:
Shinsuke Sugaya 2023-02-12 22:23:23 +09:00
parent a8b62a3200
commit 7550cf7a6c
5 changed files with 78 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pom.xml
View file

@ -996,6 +996,11 @@
<artifactId>log4j-jul</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>co.elastic.logging</groupId>
<artifactId>log4j2-ecs-layout</artifactId>
<version>${log4j.ecs.version}</version>
</dependency>
<!-- opensearch -->
<dependency>

5
src/main/resources/log4j2.xml
View file

@ -17,9 +17,10 @@
<Appenders>
<RollingFile name="AppFile" fileName="${log.file.basedir}/${domain.name}.log"
filePattern="${log.file.basedir}/${domain.name}${backup.date.suffix}-%i.log.gz">
<PatternLayout>
<!-- <PatternLayout>
<Pattern>${log.pattern}</Pattern>
</PatternLayout>
</PatternLayout> -->
<EcsLayout serviceName="fess" eventDataset="app" />
<Policies>
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="100 MB" />

20
src/main/webapp/WEB-INF/env/crawler/resources/log4j2.xml vendored
View file

@ -9,21 +9,28 @@
<Property name="log.file.basedir" value="${sys:fess.log.path:-target/logs}" />
<Property name="backup.date.suffix" value="_%d{yyyyMMdd}" />
<Property name="backup.max.history" value="10" />
<Property name="backup.max.age" value="90" />
<Property name="stats.log.pattern" value="%msg%n" />
</Properties>
<Appenders>
<RollingFile name="AppRollingFile" fileName="${log.file.basedir}/${domain.name}.log"
filePattern="${log.file.basedir}/${domain.name}${backup.date.suffix}-%i.log.gz">
<PatternLayout>
<!-- <PatternLayout>
<Pattern>${log.pattern}</Pattern>
</PatternLayout>
</PatternLayout> -->
<EcsLayout serviceName="fess" eventDataset="crawler" />
<Policies>
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="100 MB" />
</Policies>
<DefaultRolloverStrategy fileIndex="max" min="1"
max="${backup.max.history}" compressionLevel="9" />
max="${backup.max.history}" compressionLevel="9">
<Delete basePath="${log.file.basedir}">
<IfFileName glob="*.log.gz" />
<IfLastModified age="P${backup.max.age}D" />
</Delete>
</DefaultRolloverStrategy>
</RollingFile>
<Rewrite name="AppFile">
<AppenderRef ref="AppRollingFile" />
@ -39,7 +46,12 @@
<SizeBasedTriggeringPolicy size="100 MB" />
</Policies>
<DefaultRolloverStrategy fileIndex="max" min="1"
max="${backup.max.history}" compressionLevel="9" />
max="${backup.max.history}" compressionLevel="9">
<Delete basePath="${log.file.basedir}">
<IfFileName glob="*.log.gz" />
<IfLastModified age="P${backup.max.age}D" />
</Delete>
</DefaultRolloverStrategy>
</RollingFile>
</Appenders>

44
src/main/webapp/WEB-INF/env/suggest/resources/log4j2.xml vendored Normal file
View file

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN">
<Properties>
<Property name="domain.name" value="${sys:fess.log.name:-fess}" />
<Property name="log.level" value="${sys:fess.log.level:-info}" />
<Property name="root.log.level" value="${sys:fess.log.level:-warn}" />
<Property name="log.pattern" value="%d [%t] %-5p %msg%n" />
<Property name="log.file.basedir" value="${sys:fess.log.path:-target/logs}" />
<Property name="backup.date.suffix" value="_%d{yyyyMMdd}" />
<Property name="backup.max.history" value="10" />
<Property name="backup.max.age" value="90" />
</Properties>
<Appenders>
<RollingFile name="AppFile" fileName="${log.file.basedir}/${domain.name}.log"
filePattern="${log.file.basedir}/${domain.name}${backup.date.suffix}-%i.log.gz">
<!-- <PatternLayout>
<Pattern>${log.pattern}</Pattern>
</PatternLayout> -->
<EcsLayout serviceName="fess" eventDataset="suggest" />
<Policies>
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="100 MB" />
</Policies>
<DefaultRolloverStrategy fileIndex="max" min="1"
max="${backup.max.history}" compressionLevel="9">
<Delete basePath="${log.file.basedir}">
<IfFileName glob="*.log.gz" />
<IfLastModified age="P${backup.max.age}D" />
</Delete>
</DefaultRolloverStrategy>
</RollingFile>
</Appenders>
<Loggers>
<Logger name="org.codelibs.fess" additivity="false" level="${log.level}">
<AppenderRef ref="AppFile" />
</Logger>
<Root level="${root.log.level}">
<AppenderRef ref="AppFile" />
</Root>
</Loggers>
</Configuration>

13
src/main/webapp/WEB-INF/env/thumbnail/resources/log4j2.xml vendored
View file

@ -9,20 +9,27 @@
<Property name="log.file.basedir" value="${sys:fess.log.path:-target/logs}" />
<Property name="backup.date.suffix" value="_%d{yyyyMMdd}" />
<Property name="backup.max.history" value="10" />
<Property name="backup.max.age" value="90" />
</Properties>
<Appenders>
<RollingFile name="AppFile" fileName="${log.file.basedir}/${domain.name}.log"
filePattern="${log.file.basedir}/${domain.name}${backup.date.suffix}-%i.log.gz">
<PatternLayout>
<!-- <PatternLayout>
<Pattern>${log.pattern}</Pattern>
</PatternLayout>
</PatternLayout> -->
<EcsLayout serviceName="fess" eventDataset="thumbnail" />
<Policies>
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="100 MB" />
</Policies>
<DefaultRolloverStrategy fileIndex="max" min="1"
max="${backup.max.history}" compressionLevel="9" />
max="${backup.max.history}" compressionLevel="9">
<Delete basePath="${log.file.basedir}">
<IfFileName glob="*.log.gz" />
<IfLastModified age="P${backup.max.age}D" />
</Delete>
</DefaultRolloverStrategy>
</RollingFile>
</Appenders>