Merge pull request #1530 from nobodyiam/rolling-logs

use spring boot's new feature to rotate log files
apolloconfig · Oct 4, 2018 · b3fb3fa · b3fb3fa
2 parents 44aae09 + a7f4a02
commit b3fb3fa
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 43 deletions.
diff --git a/apollo-adminservice/src/main/resources/application.yml b/apollo-adminservice/src/main/resources/application.yml
@@ -11,5 +11,4 @@ server:
   port: 8090
 
 logging:
-  path: /opt/logs/100003172
-  file: ${logging.path}/apollo-adminservice.log
+  file: /opt/logs/100003172/apollo-adminservice.log
diff --git a/apollo-adminservice/src/main/resources/logback.xml b/apollo-adminservice/src/main/resources/logback.xml
@@ -3,22 +3,10 @@
 	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	<property name="LOG_FILE"
 		value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-adminservice.log}" />
-	<property name="LOG_PATH" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}" />
 	<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
 	<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
 	<root level="INFO">
 		<appender-ref ref="FILE" />
 		<appender-ref ref="CONSOLE" />
 	</root>
-
-	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${LOG_PATH}/apollo-adminservice.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-		</encoder>
-	</appender>
 </configuration>
diff --git a/apollo-common/src/main/resources/application.properties b/apollo-common/src/main/resources/application.properties
@@ -15,3 +15,5 @@ server.max-http-header-size=10240
 
 # Spring Boot 2.0
 management.endpoints.web.base-path=/
+logging.file.max-size=50MB
+logging.file.max-history=30
diff --git a/apollo-configservice/src/main/resources/application.yml b/apollo-configservice/src/main/resources/application.yml
@@ -9,7 +9,6 @@ ctrip:
 
 server:
   port: 8080
-  
+
 logging:
-  path: /opt/logs/100003171
-  file: ${logging.path}/apollo-configservice.log
+  file: /opt/logs/100003171/apollo-configservice.log
diff --git a/apollo-configservice/src/main/resources/logback.xml b/apollo-configservice/src/main/resources/logback.xml
@@ -3,22 +3,10 @@
 	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	<property name="LOG_FILE"
 		value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-configservice.log}" />
-	<property name="LOG_PATH" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}" />
 	<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
 	<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
 	<root level="INFO">
 		<appender-ref ref="FILE" />
 		<appender-ref ref="CONSOLE" />
 	</root>
-
-	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${LOG_PATH}/apollo-configservice.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-		</encoder>
-	</appender>
 </configuration>
diff --git a/apollo-portal/src/main/resources/application.yml b/apollo-portal/src/main/resources/application.yml
@@ -12,8 +12,7 @@ server:
   port: 8080
 
 logging:
-  path: /opt/logs/100003173
-  file: ${logging.path}/apollo-portal.log
+  file: /opt/logs/100003173/apollo-portal.log
 
 management:
   health:

diff --git a/apollo-portal/src/main/resources/logback.xml b/apollo-portal/src/main/resources/logback.xml
@@ -3,22 +3,10 @@
 	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
 	<property name="LOG_FILE"
 		value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-portal.log}" />
-	<property name="LOG_PATH" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}" />
 	<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
 	<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
 	<root level="INFO">
 		<appender-ref ref="FILE" />
 		<appender-ref ref="CONSOLE" />
 	</root>
-
-	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${LOG_PATH}/apollo-portal.%d{yyyy-MM-dd}.%i.log}</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-		</encoder>
-	</appender>
 </configuration>