Merge remote-tracking branch 'origin/dev' into dev

yun-zuoyi
汪云昊 5 years ago
commit cc3fd0a754

@ -23,7 +23,7 @@
<RollingRandomAccessFile name="log_file" <RollingRandomAccessFile name="log_file"
fileName="${logFileRootPath}/${project.name}.log" fileName="${logFileRootPath}/${project.name}.log"
append="false" immediateFlush="true" bufferedIO="true" bufferSize="8192" append="false" immediateFlush="true" bufferedIO="true" bufferSize="8192"
filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log"> filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz">
<PatternLayout pattern="${file_pattern}"/> <PatternLayout pattern="${file_pattern}"/>
<Filters> <Filters>
@ -39,6 +39,11 @@
<!-- 定时删除 --> <!-- 定时删除 -->
<DefaultRolloverStrategy> <DefaultRolloverStrategy>
<Delete basePath="${logFileRootPath}" maxDepth="2"> <Delete basePath="${logFileRootPath}" maxDepth="2">
<IfFileName glob="**/${project.name}**.log.gz">
<IfLastModified age="7d"/>
</IfFileName>
<!-- 兼容未压缩日志的版本,后期可移除 -->
<IfFileName glob="**/${project.name}**.log"> <IfFileName glob="**/${project.name}**.log">
<IfLastModified age="7d"/> <IfLastModified age="7d"/>
</IfFileName> </IfFileName>
@ -46,11 +51,41 @@
</DefaultRolloverStrategy> </DefaultRolloverStrategy>
</RollingRandomAccessFile> </RollingRandomAccessFile>
<!-- 应用异常日志文件-->
<RollingRandomAccessFile name="log_error_file"
fileName="${logFileRootPath}/${project.name}-error.log"
append="false" immediateFlush="true" bufferedIO="true" bufferSize="8192"
filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-error-%d{yyyy-MM-dd}-%i.log.gz">
<PatternLayout pattern="${file_pattern}"/>
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
<!-- 滚动策略 -->
<Policies>
<TimeBasedTriggeringPolicy/>
<SizeBasedTriggeringPolicy size="1024 MB"/>
</Policies>
<!-- 定时删除 -->
<DefaultRolloverStrategy>
<Delete basePath="${logFileRootPath}" maxDepth="2">
<IfFileName glob="**/${project.name}-error**.log.gz">
<IfLastModified age="7d"/>
</IfFileName>
<!-- 兼容未压缩日志的版本,后期可移除 -->
<IfFileName glob="**/${project.name}-error**.log">
<IfLastModified age="7d"/>
</IfFileName>
</Delete>
</DefaultRolloverStrategy>
</RollingRandomAccessFile>
<!-- 应用调度日志文件--> <!-- 应用调度日志文件-->
<ImppLog4j2File name="log_schedule_file" <ImppLog4j2File name="log_schedule_file"
filePath="${logFileRootPath}/schedule/" filePath="${logFileRootPath}/schedule/"
append="false" immediateFlush="true" bufferedIO="true" bufferSize="8192" append="false" immediateFlush="true" bufferedIO="true" bufferSize="8192"
filePattern="${logFileRootPath}/schedule/$${date:yyyy-MM}/task-name-%d{yyyy-MM-dd}-%i.log"> filePattern="${logFileRootPath}/schedule/$${date:yyyy-MM}/task-name-%d{yyyy-MM-dd}-%i.log.gz">
<PatternLayout pattern="${file_pattern}"/> <PatternLayout pattern="${file_pattern}"/>
<Filters> <Filters>
@ -66,6 +101,11 @@
<!-- 定时删除 --> <!-- 定时删除 -->
<DefaultRolloverStrategy> <DefaultRolloverStrategy>
<Delete basePath="${logFileRootPath}" maxDepth="2"> <Delete basePath="${logFileRootPath}" maxDepth="2">
<IfFileName glob="**/schedule/**.log.gz">
<IfLastModified age="7d"/>
</IfFileName>
<!-- 兼容未压缩日志的版本,后期可移除 -->
<IfFileName glob="**/schedule/**.log"> <IfFileName glob="**/schedule/**.log">
<IfLastModified age="7d"/> <IfLastModified age="7d"/>
</IfFileName> </IfFileName>
@ -89,6 +129,7 @@
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="log_schedule_file"/> <appender-ref ref="log_schedule_file"/>
<appender-ref ref="log_file"/> <appender-ref ref="log_file"/>
<appender-ref ref="log_error_file"/>
</root> </root>
</loggers> </loggers>
</configuration> </configuration>
Loading…
Cancel
Save