Skip to content

Commit 7c42f45

Browse files
zhuangchongzhuangchong
authored
Merge 067adbe into cdd4e7b 
2 parents cdd4e7b + 067adbe commit 7c42f45

4 files changed

Lines changed: 67 additions & 4 deletions

File tree

‎dolphinscheduler-standalone-server/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
<artifactId>dolphinscheduler-alert-server</artifactId>
4646
</dependency>
4747

48+
<dependency>
49+
<groupId>org.apache.dolphinscheduler</groupId>
50+
<artifactId>dolphinscheduler-log-server</artifactId>
51+
</dependency>
52+
4853
<dependency>
4954
<groupId>org.apache.curator</groupId>
5055
<artifactId>curator-test</artifactId>

‎dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package org.apache.dolphinscheduler;
1919

20+
import org.apache.dolphinscheduler.server.log.LoggerServer;
21+
2022
import org.apache.curator.test.TestingServer;
2123

2224
import org.springframework.boot.SpringApplication;
@@ -27,7 +29,7 @@ public class StandaloneServer {
2729
public static void main(String[] args) throws Exception {
2830
final TestingServer server = new TestingServer(true);
2931
System.setProperty("registry.zookeeper.connect-string", server.getConnectString());
30-
32+
new LoggerServer().start();
3133
SpringApplication.run(StandaloneServer.class, args);
3234
}
3335
}

‎dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
-->
1818

1919
<configuration scan="true" scanPeriod="120 seconds">
20+
<property name="log.base" value="logs"/>
21+
2022
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
2123
<encoder>
2224
<pattern>
@@ -26,11 +28,58 @@
2628
</encoder>
2729
</appender>
2830

31+
<appender name="STANDALONELOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
32+
<file>${log.base}/dolphinscheduler-standalone.log</file>
33+
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
34+
<level>INFO</level>
35+
</filter>
36+
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
37+
<fileNamePattern>${log.base}/dolphinscheduler-standalone.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
38+
<maxHistory>168</maxHistory>
39+
<maxFileSize>200MB</maxFileSize>
40+
</rollingPolicy>
41+
<encoder>
42+
<pattern>
43+
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
44+
</pattern>
45+
<charset>UTF-8</charset>
46+
</encoder>
47+
</appender>
48+
2949
<logger name="org.apache.zookeeper" level="WARN"/>
3050
<logger name="org.apache.hbase" level="WARN"/>
3151
<logger name="org.apache.hadoop" level="WARN"/>
3252

53+
<conversionRule conversionWord="messsage"
54+
converterClass="org.apache.dolphinscheduler.server.log.SensitiveDataConverter"/>
55+
<appender name="TASKLOGFILE" class="ch.qos.logback.classic.sift.SiftingAppender">
56+
<filter class="org.apache.dolphinscheduler.server.log.TaskLogFilter"/>
57+
<Discriminator class="org.apache.dolphinscheduler.server.log.TaskLogDiscriminator">
58+
<key>taskAppId</key>
59+
<logBase>${log.base}</logBase>
60+
</Discriminator>
61+
<sift>
62+
<appender name="FILE-${taskAppId}" class="ch.qos.logback.core.FileAppender">
63+
<file>${log.base}/${taskAppId}.log</file>
64+
<encoder>
65+
<pattern>
66+
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %messsage%n
67+
</pattern>
68+
<charset>UTF-8</charset>
69+
</encoder>
70+
<append>true</append>
71+
</appender>
72+
</sift>
73+
</appender>
74+
3375
<root level="INFO">
34-
<appender-ref ref="STDOUT"/>
76+
<if condition="${DOCKER:-false}">
77+
<then>
78+
<appender-ref ref="STDOUT"/>
79+
</then>
80+
</if>
81+
<appender-ref ref="STANDALONELOGFILE"/>
82+
<appender-ref ref="TASKLOGFILE"/>
3583
</root>
84+
3685
</configuration>

‎pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@
240240
<artifactId>dolphinscheduler-worker</artifactId>
241241
<version>${project.version}</version>
242242
</dependency>
243+
<dependency>
244+
<groupId>org.apache.dolphinscheduler</groupId>
245+
<artifactId>dolphinscheduler-log-server</artifactId>
246+
<version>${project.version}</version>
247+
</dependency>
243248
<dependency>
244249
<groupId>org.apache.dolphinscheduler</groupId>
245250
<artifactId>dolphinscheduler-standalone-server</artifactId>
@@ -939,11 +944,12 @@
939944
<workingDirectory>${project.basedir}</workingDirectory>
940945
<arguments>
941946
<argument>build</argument>
947+
<argument>--no-cache</argument>
942948
<argument>-t</argument>
943949
<argument>${docker.hub}/${docker.repo}:${docker.tag}</argument>
944950
<argument>-t</argument>
945951
<argument>${docker.hub}/${docker.repo}:latest</argument>
946-
<argument>.</argument>
952+
<argument>${project.basedir}</argument>
947953
<argument>--file=src/main/docker/Dockerfile</argument>
948954
</arguments>
949955
</configuration>
@@ -963,12 +969,13 @@
963969
<arguments>
964970
<argument>buildx</argument>
965971
<argument>build</argument>
972+
<argument>--no-cache</argument>
966973
<argument>--push</argument>
967974
<argument>-t</argument>
968975
<argument>${docker.hub}/${docker.repo}:${docker.tag}</argument>
969976
<argument>-t</argument>
970977
<argument>${docker.hub}/${docker.repo}:latest</argument>
971-
<argument>.</argument>
978+
<argument>${project.basedir}</argument>
972979
<argument>--file=src/main/docker/Dockerfile</argument>
973980
</arguments>
974981
</configuration>

0 commit comments

Comments
 (0)