Skip to content

S
secoo-log
Commit aa27a4b9 by QIANGLU
Options

Merge branch 'master' into dev 

# Conflicts:
#	pom.xml
#	secoo-log-starter/pom.xml
#	secoo-log-starter/src/main/resources/logback-spring.xml
#	secoo-log/pom.xml
parents 428e5f20 7a8bdb3c
Showing with 23 additions and 264 deletions
README.md
...@@ -85,6 +85,8 @@ logMaxHistory 历史保留时间 D ...@@ -85,6 +85,8 @@ logMaxHistory 历史保留时间 D
Version Update Version Update
已经封板 迁移到matrix
1.0.5 1.0.5
增加动态历史参数等变更 增加动态历史参数等变更
1.0.6 1.0.6
......
pom.xml
...@@ -5,13 +5,9 @@ ...@@ -5,13 +5,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>secoo-log-parent</artifactId> <artifactId>secoo-log</artifactId>
<packaging>pom</packaging> <version>1.1.1-DEV-SNAPSHOT</version>
<version>1.0.7-DEV-SNAPSHOT</version>
<modules>
<module>secoo-log-starter</module>
<module>secoo-log</module>
</modules>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
...@@ -19,7 +15,6 @@ ...@@ -19,7 +15,6 @@
<janino.version>3.0.6</janino.version> <janino.version>3.0.6</janino.version>
</properties> </properties>
<dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
...@@ -42,6 +37,11 @@ ...@@ -42,6 +37,11 @@
<artifactId>log4j-over-slf4j</artifactId> <artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- 支持logback condition表达式 --> <!-- 支持logback condition表达式 -->
<dependency> <dependency>
<groupId>org.codehaus.janino</groupId> <groupId>org.codehaus.janino</groupId>
...@@ -55,50 +55,17 @@ ...@@ -55,50 +55,17 @@
<version>6.3.0.RELEASE</version> <version>6.3.0.RELEASE</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement>
<profiles> <distributionManagement>
<profile> <snapshotRepository>
<id>dev</id> <id>secoo-dev</id>
<activation> <name>secoo-dev-repository</name>
<activeByDefault>true</activeByDefault> <url>http://secoo-dev:secoo-dev@nexus.secoo.com:8081/nexus/content/repositories/secoo-hosted-dev/</url>
</activation> </snapshotRepository>
<properties> <repository>
<ver_type>-DEV-SNAPSHOT</ver_type> <id>secoo-pro</id>
</properties> <name>secoo-pro-repository</name>
<distributionManagement> <url>http://secoo-pro:secoo-PRO@nexus.secoo.com:8081/nexus/content/repositories/secoo-hosted-pro/</url>
<repository> </repository>
<id>secoo-dev</id> </distributionManagement>
<name>secoo-dev-repository</name>
<url>http://nexus.secoo.com:8081/nexus/content/repositories/secoo-hosted-dev/</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>test</id>
<properties>
<ver_type>-SNAPSHOT</ver_type>
</properties>
<distributionManagement>
<repository>
<id>secoo-test</id>
<name>secoo-test-repository</name>
<url>http://nexus.secoo.com:8081/nexus/content/repositories/secoo-hosted-test/</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>pro</id>
<properties>
<ver_type>.RELEASE</ver_type>
</properties>
<distributionManagement>
<repository>
<id>secoo-pro</id>
<name>secoo-pro-repository</name>
<url>http://nexus.secoo.com:8081/nexus/content/repositories/secoo-hosted-pro/</url>
</repository>
</distributionManagement>
</profile>
</profiles>
</project> </project>
\ No newline at end of file
secoo-log-starter/pom.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>secoo-log-parent</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.0.7-DEV-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>secoo-log-starter</artifactId>
<name>${project.artifactId}</name>
<properties>
<spring.boot.version>2.0.5.RELEASE</spring.boot.version>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<!-- 桥接slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<!-- 打印skywalking tid插件-->
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
secoo-log-starter/src/main/resources/logback-spring.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd"> -->
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<springProperty scope="context" name="logName" source="spring.application.name" defaultValue="app"/>
<springProperty scope="context" name="logLevel" source="log.level" defaultValue="info"/>
<springProperty scope="context" name="LOG_PATH" source="log.path" defaultValue="/data/logs"/>
<springProperty scope="context" name="MAX_FILE_SIZE" source="log.max_file_size" defaultValue="128MB"/>
<springProperty scope="context" name="MAX_HISTORY" source="log.max_history" defaultValue="7"/>
<springProperty scope="context" name="PATTERN" source="log.pattern" defaultValue="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{tid}|%thread|%logger{36}.%M:%L-%msg%n"/>
<property name="LOG_DIR" value="${LOG_PATH}/${logName}/%d{yyyyMMdd}"/>
<property name="CHARSET" value="UTF-8"/>
<jmxConfigurator/>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>${PATTERN}</pattern>
</layout>
</appender>
<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level> <!-- 只记录error级别的日志 -->
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<!-- 定义文件的名称 -->
<file>${LOG_PATH}/${logName}/error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_DIR}/err_${logName}%i.log</FileNamePattern>
<MaxHistory>${MAX_HISTORY}</MaxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
<Pattern>${PATTERN}</Pattern>
</layout>
</appender>
<appender name="APP" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 定义文件的名称 -->
<file>${LOG_PATH}/${logName}/app.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_DIR}/all_${logName}%i.log</FileNamePattern>
<MaxHistory>${MAX_HISTORY}</MaxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
<pattern>${PATTERN}</pattern>
</layout>
</appender>
<appender name="ASYN_APP" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="APP"/>
<queueSize>1024</queueSize>
<neverBlock>true</neverBlock>
<includeCallerData>true</includeCallerData>
</appender>
<appender name="ASYN_ERROR" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="ERROR"/>
<queueSize>256</queueSize>
<neverBlock>true</neverBlock>
<includeCallerData>true</includeCallerData>
</appender>
<logger name="app" level="${logLevel}">
<appender-ref ref="ASYN_APP"/>
</logger>
<logger name="error" level="${logLevel}">
<appender-ref ref="ASYN_ERROR"/>
</logger>
<!-- 日志排除 -->
<logger name="org.logicalcobwebs.proxool" level="error"/>
<!--统一日志输出级别，其他appender中如果有高于此处等级设置的也会被输出 -->
<root level="${logLevel}">
<appender-ref ref="STDOUT" />
<appender-ref ref="ASYN_APP"/>
<appender-ref ref="ASYN_ERROR"/>
</root>
</configuration>
\ No newline at end of file
secoo-log-starter/src/test/java/SpringBootStartTest.java deleted 100644 → 0
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**
* spring boot start log test
*
* @author zhanghao
* @date 2019-06-2714:29
*/
@SpringBootApplication
public class SpringBootStartTest {
private static Logger logger = LoggerFactory.getLogger(SpringBootStartTest.class);
public static void main(String[] args) {
// SpringApplication.run(SpringBootStartTest.class, args);
logger.info("Started Application SpringBootApplicationTest, args={}", args);
}
}
secoo-log-starter/src/test/resources/application.yml deleted 100644 → 0
server:
port: 8080
spring:
application:
name: SpringBootApplicationTest
\ No newline at end of file
secoo-log/pom.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>secoo-log-parent</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.0.7-DEV-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>secoo-log</artifactId>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<!-- 桥接slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<!-- 打印skywalking tid插件-->
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment