zouxuan 1 year ago
parent
commit
c76eb3f085

+ 0 - 2
cooleshow-task/src/main/resources/bootstrap-dev.yml

@@ -10,5 +10,3 @@ spring:
         refresh:
           enabled: true
         enabled: true
-logging:
-  config: classpath:logback-dev.xml

+ 1 - 3
cooleshow-task/src/main/resources/bootstrap-test.yml

@@ -9,6 +9,4 @@ spring:
         file-extension: yaml
         refresh:
           enabled: true
-        enabled: true
-logging:
-  config: classpath:logback-dev.xml
+        enabled: true

+ 0 - 37
cooleshow-task/src/main/resources/logback-dev.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="10 seconds">
-
-	<property name="LOG_HOME" value="/mdata/cooleshow-dev/jenkins/logs/task-%d{yyyy-MM-dd_HH}-%i.log" />
-	<property name="CONSOLE_LOG_PATTERN"
-			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
-
-	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder charset="UTF-8">
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="file"
-			  class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${LOG_HOME}</FileNamePattern>
-			<MaxHistory>90</MaxHistory>
-			<TimeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<MaxFileSize>20MB</MaxFileSize>
-			</TimeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-
-		<encoder>
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-		</encoder>
-	</appender>
-
-	<logger name="com.yonge" level="INFO" />
-
-	<root level="INFO">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-	</root>
-
-</configuration>

+ 1 - 1
cooleshow-task/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mdata/cooleshow-dev/jenkins/logs/task-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="/mdata/cooleshow-test/jenkins/logs/task-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />