Skip to content

Commit

Permalink
Fix alibaba#67
Browse files Browse the repository at this point in the history 
The configuration module log is changed to config
  • Loading branch information
@yanlinly
yanlinly committed Sep 19, 2018
1 parent b9cd75b commit 9839062
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 50 deletions.
48 changes: 24 additions & 24 deletions config/src/main/resources/nacos-config-logback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

<appender name="dumpFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-dump.log</file>
<file>${user.home}/nacos/logs/config-dump.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-dump.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-dump.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
Expand All @@ -20,10 +20,10 @@
</appender>
<appender name="pullFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-pull.log</file>
<file>${user.home}/nacos/logs/config-pull.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-pull.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-pull.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
Expand All @@ -36,10 +36,10 @@
</appender>
<appender name="fatalFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-fatal.log</file>
<file>${user.home}/nacos/logs/config-fatal.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-fatal.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-fatal.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
Expand All @@ -52,10 +52,10 @@
</appender>
<appender name="memoryFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-memory.log</file>
<file>${user.home}/nacos/logs/config-memory.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-memory.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-memory.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
Expand All @@ -68,10 +68,10 @@
</appender>
<appender name="pullCheckFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-pull-check.log</file>
<file>${user.home}/nacos/logs/config-pull-check.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-pull-check.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-pull-check.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
Expand All @@ -85,10 +85,10 @@

<appender name="aclLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-acl.log</file>
<file>${user.home}/nacos/logs/config-acl.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-acl.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-acl.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>512MB</totalSizeCap>
Expand All @@ -102,10 +102,10 @@

<appender name="clientLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-client-request.log</file>
<file>${user.home}/nacos/logs/config-client-request.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-client-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-client-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
Expand All @@ -119,10 +119,10 @@

<appender name="sdkLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-sdk-request.log</file>
<file>${user.home}/nacos/logs/config-sdk-request.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-sdk-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-sdk-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
Expand All @@ -136,10 +136,10 @@

<appender name="traceLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-trace.log</file>
<file>${user.home}/nacos/logs/config-trace.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-trace.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-trace.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
Expand All @@ -153,10 +153,10 @@

<appender name="notifyLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-notify.log</file>
<file>${user.home}/nacos/logs/config-notify.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-notify.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-notify.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
Expand All @@ -170,10 +170,10 @@

<appender name="appCollectorLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-app.log</file>
<file>${user.home}/nacos/logs/config-app.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-app.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-app.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
Expand All @@ -187,10 +187,10 @@

<appender name="startLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/nacos/logs/cfg-server.log</file>
<file>${user.home}/nacos/logs/config-server.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${user.home}/nacos/logs/cfg-server.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${user.home}/nacos/logs/config-server.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>512MB</totalSizeCap>
Expand Down
48 changes: 24 additions & 24 deletions distribution/conf/nacos-logback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@
<!--config module logback config-->
<appender name="dumpFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-dump.log</file>
<file>${nacos.home}/logs/config-dump.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-dump.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-dump.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
Expand All @@ -205,10 +205,10 @@
</appender>
<appender name="pullFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-pull.log</file>
<file>${nacos.home}/logs/config-pull.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-pull.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-pull.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
Expand All @@ -221,10 +221,10 @@
</appender>
<appender name="fatalFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-fatal.log</file>
<file>${nacos.home}/logs/config-fatal.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-fatal.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-fatal.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
Expand All @@ -237,10 +237,10 @@
</appender>
<appender name="memoryFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-memory.log</file>
<file>${nacos.home}/logs/config-memory.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-memory.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-memory.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
Expand All @@ -253,10 +253,10 @@
</appender>
<appender name="pullCheckFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-pull-check.log</file>
<file>${nacos.home}/logs/config-pull-check.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-pull-check.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-pull-check.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
Expand All @@ -270,10 +270,10 @@

<appender name="aclLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-acl.log</file>
<file>${nacos.home}/logs/config-acl.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-acl.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-acl.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>512MB</totalSizeCap>
Expand All @@ -287,10 +287,10 @@

<appender name="clientLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-client-request.log</file>
<file>${nacos.home}/logs/config-client-request.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-client-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-client-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
Expand All @@ -304,10 +304,10 @@

<appender name="sdkLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-sdk-request.log</file>
<file>${nacos.home}/logs/config-sdk-request.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-sdk-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-sdk-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
Expand All @@ -321,10 +321,10 @@

<appender name="traceLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-trace.log</file>
<file>${nacos.home}/logs/config-trace.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-trace.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-trace.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
Expand All @@ -338,10 +338,10 @@

<appender name="notifyLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-notify.log</file>
<file>${nacos.home}/logs/config-notify.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-notify.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-notify.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
Expand All @@ -355,10 +355,10 @@

<appender name="appCollectorLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-app.log</file>
<file>${nacos.home}/logs/config-app.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-app.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-app.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
Expand All @@ -372,10 +372,10 @@

<appender name="startLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${nacos.home}/logs/cfg-server.log</file>
<file>${nacos.home}/logs/config-server.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cfg-server.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${nacos.home}/logs/config-server.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>512MB</totalSizeCap>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
<artifactId>spotbugs-annotations</artifactId>
<version>3.1.3</version>
</dependency>
<!-- cfg-->
<!-- config-->

<dependency>
<groupId>javax.ws.rs</groupId>
Expand Down Expand Up @@ -640,7 +640,7 @@
<artifactId>jackson-mapper-lgpl</artifactId>
<version>1.9.6</version>
</dependency>
<!-- cfg-->
<!-- config-->


<!-- naming -->
Expand Down

0 comments on commit 9839062

Please sign in to comment.