This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch pull/heads/7481 in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 03556659e8c58f3ca92ee7e073aa2f4f07a8daf4 Author: zhuangchong <[email protected]> AuthorDate: Sat Dec 18 22:07:01 2021 +0800 update logback file in the standalone server. --- dolphinscheduler-log-server/pom.xml | 10 ---- .../src/main/resources/logback-spring.xml | 62 ++-------------------- 2 files changed, 5 insertions(+), 67 deletions(-) diff --git a/dolphinscheduler-log-server/pom.xml b/dolphinscheduler-log-server/pom.xml index 3bd8896..de58a62 100644 --- a/dolphinscheduler-log-server/pom.xml +++ b/dolphinscheduler-log-server/pom.xml @@ -52,16 +52,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>*.yaml</exclude> - <exclude>*.xml</exclude> - </excludes> - </configuration> - </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> diff --git a/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml b/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml index abed0f1..8e135e4 100644 --- a/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml +++ b/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml @@ -28,16 +28,15 @@ </encoder> </appender> - <!-- api log --> - <appender name="APILOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.base}/dolphinscheduler-api.log</file> + <appender name="STANDALONELOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${log.base}/dolphinscheduler-standalone.log</file> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <level>INFO</level> </filter> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${log.base}/dolphinscheduler-api.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern> + <fileNamePattern>${log.base}/dolphinscheduler-standalone.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern> <maxHistory>168</maxHistory> - <maxFileSize>64MB</maxFileSize> + <maxFileSize>200MB</maxFileSize> </rollingPolicy> <encoder> <pattern> @@ -51,22 +50,6 @@ <logger name="org.apache.hbase" level="WARN"/> <logger name="org.apache.hadoop" level="WARN"/> - <!-- alert log --> - <appender name="ALERTLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.base}/dolphinscheduler-alert.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${log.base}/dolphinscheduler-alert.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern> - <maxHistory>20</maxHistory> - <maxFileSize>64MB</maxFileSize> - </rollingPolicy> - <encoder> - <pattern> - [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n - </pattern> - <charset>UTF-8</charset> - </encoder> - </appender> - <conversionRule conversionWord="messsage" converterClass="org.apache.dolphinscheduler.server.log.SensitiveDataConverter"/> <appender name="TASKLOGFILE" class="ch.qos.logback.classic.sift.SiftingAppender"> @@ -89,49 +72,14 @@ </sift> </appender> - <!-- master log --> - <appender name="MASTERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.base}/dolphinscheduler-master.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${log.base}/dolphinscheduler-master.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern> - <maxHistory>168</maxHistory> - <maxFileSize>200MB</maxFileSize> - </rollingPolicy> - <encoder> - <pattern> - [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n - </pattern> - <charset>UTF-8</charset> - </encoder> - </appender> - - <!-- worker log --> - <appender name="WORKERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${log.base}/dolphinscheduler-worker.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${log.base}/dolphinscheduler-worker.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern> - <maxHistory>168</maxHistory> - <maxFileSize>200MB</maxFileSize> - </rollingPolicy> - <encoder> - <pattern> - [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n - </pattern> - <charset>UTF-8</charset> - </encoder> - </appender> - <root level="INFO"> <if condition="${DOCKER:-false}"> <then> <appender-ref ref="STDOUT"/> </then> </if> - <appender-ref ref="APILOGFILE"/> - <appender-ref ref="ALERTLOGFILE"/> + <appender-ref ref="STANDALONELOGFILE"/> <appender-ref ref="TASKLOGFILE"/> - <appender-ref ref="MASTERLOGFILE"/> - <appender-ref ref="WORKERLOGFILE"/> </root> </configuration>
