chore: deprecated level

This commit is contained in:
CaptainB 2023-04-17 14:50:28 +08:00
parent e87337d34a
commit c76abd6a85
2 changed files with 49 additions and 107 deletions

View File

@ -10,7 +10,6 @@ logging.file.path=/opt/metersphere/logs/metersphere
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.maximum-pool-size=100 spring.datasource.hikari.maximum-pool-size=100
spring.datasource.hikari.auto-commit=true spring.datasource.hikari.auto-commit=true
spring.datasource.hikari.idle-timeout=10000
spring.datasource.hikari.pool-name=DatebookHikariCP spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.max-lifetime=1800000 spring.datasource.hikari.max-lifetime=1800000
spring.datasource.hikari.connection-timeout=30000 spring.datasource.hikari.connection-timeout=30000
@ -21,7 +20,6 @@ spring.datasource.quartz.username=${spring.datasource.username}
spring.datasource.quartz.password=${spring.datasource.password} spring.datasource.quartz.password=${spring.datasource.password}
spring.datasource.quartz.hikari.maximum-pool-size=50 spring.datasource.quartz.hikari.maximum-pool-size=50
spring.datasource.quartz.hikari.auto-commit=true spring.datasource.quartz.hikari.auto-commit=true
spring.datasource.quartz.hikari.idle-timeout=10000
spring.datasource.quartz.hikari.pool-name=DatebookHikariCP spring.datasource.quartz.hikari.pool-name=DatebookHikariCP
spring.datasource.quartz.hikari.max-lifetime=1800000 spring.datasource.quartz.hikari.max-lifetime=1800000
spring.datasource.quartz.hikari.connection-timeout=30000 spring.datasource.quartz.hikari.connection-timeout=30000
@ -98,3 +96,6 @@ spring.session.timeout=43200s
# redisson # redisson
spring.redis.redisson.file=file:/opt/metersphere/conf/redisson.yml spring.redis.redisson.file=file:/opt/metersphere/conf/redisson.yml
spring.session.redis.repository-type=indexed spring.session.redis.repository-type=indexed
#
spring.freemarker.check-template-location=false
spring.groovy.template.check-template-location=false

View File

@ -16,14 +16,10 @@
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
<File>${logging.file.path}/debug.log</File> <File>${logging.file.path}/debug.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/debug.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/debug.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -37,14 +33,10 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/info.log</File> <File>${logging.file.path}/info.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/info.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/info.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -61,14 +53,10 @@
</filter> </filter>
<File>${logging.file.path}/error.log</File> <File>${logging.file.path}/error.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/error.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/error.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -84,14 +72,10 @@
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
<File>${logging.file.path}/warn.log</File> <File>${logging.file.path}/warn.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/warn.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/warn.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -148,14 +132,10 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/api-test.log</File> <File>${logging.file.path}/api-test.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/api-test.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/api-test.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -169,8 +149,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="apiAppender"/> <appender-ref ref="apiAppender"/>
</appender> </appender>
<logger name="api-test" additivity="false"> <logger name="api-test" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="apiTestAppender"/> <appender-ref ref="apiTestAppender"/>
</logger> </logger>
@ -181,14 +160,10 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/load-test.log</File> <File>${logging.file.path}/load-test.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/load-test.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/load-test.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -202,8 +177,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="loadAppender"/> <appender-ref ref="loadAppender"/>
</appender> </appender>
<logger name="load-test" additivity="false"> <logger name="load-test" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="loadTestAppender"/> <appender-ref ref="loadTestAppender"/>
</logger> </logger>
@ -214,14 +188,11 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/project.log</File> <File>${logging.file.path}/project.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/project.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/project.%d{yyyyMMdd}-%i.log
</FileNamePattern> </FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -235,8 +206,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="projectAppender"/> <appender-ref ref="projectAppender"/>
</appender> </appender>
<logger name="project-management" additivity="false"> <logger name="project-management" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="projectManagementAppender"/> <appender-ref ref="projectManagementAppender"/>
</logger> </logger>
@ -248,14 +218,11 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/system-setting.log</File> <File>${logging.file.path}/system-setting.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/system-setting.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/system-setting.%d{yyyyMMdd}-%i.log
</FileNamePattern> </FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -269,8 +236,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="systemAppender"/> <appender-ref ref="systemAppender"/>
</appender> </appender>
<logger name="system-setting" additivity="false"> <logger name="system-setting" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="systemSettingAppender"/> <appender-ref ref="systemSettingAppender"/>
</logger> </logger>
@ -281,14 +247,11 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/test-plan.log</File> <File>${logging.file.path}/test-plan.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/test-plan.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/test-plan.%d{yyyyMMdd}-%i.log
</FileNamePattern> </FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -302,8 +265,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="testPlanAppender"/> <appender-ref ref="testPlanAppender"/>
</appender> </appender>
<logger name="test-plan" additivity="false"> <logger name="test-plan" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="testPlanRefAppender"/> <appender-ref ref="testPlanRefAppender"/>
</logger> </logger>
@ -314,14 +276,10 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/test-track.log</File> <File>${logging.file.path}/test-track.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/test-track.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/test-track.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -335,8 +293,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="testTrackAppender"/> <appender-ref ref="testTrackAppender"/>
</appender> </appender>
<logger name="test-track" additivity="false"> <logger name="test-track" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="testTrackRefAppender"/> <appender-ref ref="testTrackRefAppender"/>
</logger> </logger>
@ -348,14 +305,10 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/ui-test.log</File> <File>${logging.file.path}/ui-test.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/ui-test.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/ui-test.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -369,8 +322,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="uiTestAppender"/> <appender-ref ref="uiTestAppender"/>
</appender> </appender>
<logger name="ui-test" additivity="false"> <logger name="ui-test" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="uiTestRefAppender"/> <appender-ref ref="uiTestRefAppender"/>
</logger> </logger>
@ -382,14 +334,10 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/workstation.log</File> <File>${logging.file.path}/workstation.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/workstation.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/workstation.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -403,8 +351,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="workstationAppender"/> <appender-ref ref="workstationAppender"/>
</appender> </appender>
<logger name="workstation" additivity="false"> <logger name="workstation" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="workstationRefAppender"/> <appender-ref ref="workstationRefAppender"/>
</logger> </logger>
@ -415,14 +362,10 @@
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<File>${logging.file.path}/ms-jmeter-run.log</File> <File>${logging.file.path}/ms-jmeter-run.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/ms-jmeter-run-log.%d{yyyyMMdd}-%i.log <FileNamePattern>${logging.file.path}/history/ms-jmeter-run-log.%d{yyyyMMdd}-%i.log</FileNamePattern>
</FileNamePattern>
<maxHistory>${logger.max.history:-30}</maxHistory> <maxHistory>${logger.max.history:-30}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy <maxFileSize>50MB</maxFileSize>
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<charset>UTF-8</charset> <charset>UTF-8</charset>
@ -436,8 +379,7 @@
<queueSize>10000</queueSize> <queueSize>10000</queueSize>
<appender-ref ref="apiRunLogAppender"/> <appender-ref ref="apiRunLogAppender"/>
</appender> </appender>
<logger name="ms-jmeter-run-log" additivity="false"> <logger name="ms-jmeter-run-log" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="runLogAppender"/> <appender-ref ref="runLogAppender"/>
</logger> </logger>
@ -452,8 +394,7 @@
<logger name="org.apache.jmeter" additivity="false" level="INFO"> <logger name="org.apache.jmeter" additivity="false" level="INFO">
<appender-ref ref="JMETER_LOG"/> <appender-ref ref="JMETER_LOG"/>
</logger> </logger>
<logger name="io.metersphere" additivity="false"> <logger name="io.metersphere" additivity="false" level="${logger.level:INFO}">
<level value="${logger.level:INFO}"/>
<appender-ref ref="infoAsyncAppender"/> <appender-ref ref="infoAsyncAppender"/>
<appender-ref ref="warnAsyncAppender"/> <appender-ref ref="warnAsyncAppender"/>
<appender-ref ref="errorAsyncAppender"/> <appender-ref ref="errorAsyncAppender"/>