This is an automated email from the ASF dual-hosted git repository. lta pushed a commit to branch sync_minor_fix in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f429c323896cd2d55dd94b2bf644c4f54197dbf5 Author: lta <[email protected]> AuthorDate: Wed Jan 8 15:47:53 2020 +0800 redirect sync log --- .../conf/{logback.xml => logback-sync.xml} | 60 ++++------------------ server/src/assembly/resources/conf/logback.xml | 20 -------- .../assembly/resources/tools/start-sync-client.bat | 2 +- .../assembly/resources/tools/start-sync-client.sh | 2 +- 4 files changed, 12 insertions(+), 72 deletions(-) diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback-sync.xml similarity index 67% copy from server/src/assembly/resources/conf/logback.xml copy to server/src/assembly/resources/conf/logback-sync.xml index e199641..081b1cc 100644 --- a/server/src/assembly/resources/conf/logback.xml +++ b/server/src/assembly/resources/conf/logback-sync.xml @@ -24,9 +24,9 @@ <!-- prevent logback from outputting its own status at the start of every log --> <statusListener class="ch.qos.logback.core.status.NopStatusListener"/> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEERROR"> - <file>${IOTDB_HOME}/logs/log_error.log</file> + <file>${IOTDB_HOME}/logs/sync/log_error.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <fileNamePattern>${IOTDB_HOME}/logs/sync/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> <maxFileSize>2MB</maxFileSize> </timeBasedFileNamingAndTriggeringPolicy> @@ -43,9 +43,9 @@ </filter> </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEWARN"> - <file>${IOTDB_HOME}/logs/log_warn.log</file> + <file>${IOTDB_HOME}/logs/sync/log_warn.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <fileNamePattern>${IOTDB_HOME}/logs/sync/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> <maxFileSize>2MB</maxFileSize> </timeBasedFileNamingAndTriggeringPolicy> @@ -62,9 +62,9 @@ </filter> </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEINFO"> - <file>${IOTDB_HOME}/logs/log_info.log</file> + <file>${IOTDB_HOME}/logs/sync/log_info.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <fileNamePattern>${IOTDB_HOME}/logs/sync/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> <maxFileSize>200MB</maxFileSize> </timeBasedFileNamingAndTriggeringPolicy> @@ -81,9 +81,9 @@ </filter> </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEDEBUG"> - <file>${IOTDB_HOME}/logs/log_debug.log</file> + <file>${IOTDB_HOME}/logs/sync/log_debug.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <fileNamePattern>${IOTDB_HOME}/logs/sync/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> <maxFileSize>200MB</maxFileSize> </timeBasedFileNamingAndTriggeringPolicy> @@ -113,9 +113,9 @@ <logger level="info" name="org.apache.iotdb.db.conf"/> <!-- a log appender that collect all log records whose level is greather than debug--> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEALL"> - <file>${IOTDB_HOME}/logs/log_all.log</file> + <file>${IOTDB_HOME}/logs/sync/log_all.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-all-%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <fileNamePattern>${IOTDB_HOME}/logs/sync/log-all-%d{yyyy-MM-dd}.%i.log</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> <maxFileSize>200MB</maxFileSize> </timeBasedFileNamingAndTriggeringPolicy> @@ -129,40 +129,6 @@ <level>INFO</level> </filter> </appender> - <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILE_COST_MEASURE"> - <file>${IOTDB_HOME}/logs/log_measure.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>200MB</maxFileSize> - </timeBasedFileNamingAndTriggeringPolicy> - </rollingPolicy> - <append>true</append> - <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> - <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>INFO</level> - </filter> - </appender> - <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILE_DYNAMIC_PARAMETER"> - <file>${IOTDB_HOME}/logs/log_dynamic_adapter.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>200MB</maxFileSize> - </timeBasedFileNamingAndTriggeringPolicy> - </rollingPolicy> - <append>true</append> - <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> - <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>DEBUG</level> - </filter> - </appender> <root level="info"> <appender-ref ref="FILEDEBUG"/> <appender-ref ref="FILEWARN"/> @@ -170,10 +136,4 @@ <appender-ref ref="FILEALL"/> <appender-ref ref="stdout"/> </root> - <logger level="info" name="org.apache.iotdb.db.cost.statistic"> - <appender-ref ref="FILE_COST_MEASURE"/> - </logger> - <logger level="debug" name="org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter"> - <appender-ref ref="FILE_DYNAMIC_PARAMETER"/> - </logger> </configuration> diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback.xml index e199641..796dcd6 100644 --- a/server/src/assembly/resources/conf/logback.xml +++ b/server/src/assembly/resources/conf/logback.xml @@ -146,23 +146,6 @@ <level>INFO</level> </filter> </appender> - <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILE_DYNAMIC_PARAMETER"> - <file>${IOTDB_HOME}/logs/log_dynamic_adapter.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>200MB</maxFileSize> - </timeBasedFileNamingAndTriggeringPolicy> - </rollingPolicy> - <append>true</append> - <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> - <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> - <charset>utf-8</charset> - </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>DEBUG</level> - </filter> - </appender> <root level="info"> <appender-ref ref="FILEDEBUG"/> <appender-ref ref="FILEWARN"/> @@ -173,7 +156,4 @@ <logger level="info" name="org.apache.iotdb.db.cost.statistic"> <appender-ref ref="FILE_COST_MEASURE"/> </logger> - <logger level="debug" name="org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter"> - <appender-ref ref="FILE_DYNAMIC_PARAMETER"/> - </logger> </configuration> diff --git a/server/src/assembly/resources/tools/start-sync-client.bat b/server/src/assembly/resources/tools/start-sync-client.bat index 6ddfbec..376afa9 100755 --- a/server/src/assembly/resources/tools/start-sync-client.bat +++ b/server/src/assembly/resources/tools/start-sync-client.bat @@ -35,7 +35,7 @@ if NOT DEFINED JAVA_HOME goto :err @REM ----------------------------------------------------------------------------- @REM JVM Opts we'll use in legacy run or installation set JAVA_OPTS=-ea^ - -Dlogback.configurationFile="%IOTDB_CONF%\logback.xml"^ + -Dlogback.configurationFile="%IOTDB_CONF%\logback-sync.xml"^ -DIOTDB_HOME=%IOTDB_HOME%^ -DTSFILE_HOME=%IOTDB_HOME%^ -DIOTDB_CONF=%IOTDB_CONF% diff --git a/server/src/assembly/resources/tools/start-sync-client.sh b/server/src/assembly/resources/tools/start-sync-client.sh index 505f85c..c4f1907 100755 --- a/server/src/assembly/resources/tools/start-sync-client.sh +++ b/server/src/assembly/resources/tools/start-sync-client.sh @@ -49,6 +49,6 @@ done MAIN_CLASS=org.apache.iotdb.db.sync.sender.transfer.SyncClient -"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -DTSFILE_HOME=${IOTDB_HOME} -DIOTDB_CONF=${IOTDB_CONF} -Dlogback.configurationFile=${IOTDB_CONF}/logback.xml $IOTDB_DERBY_OPTS $IOTDB_JMX_OPTS -Dname=SyncClient -cp "$CLASSPATH" "$MAIN_CLASS" +"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -DTSFILE_HOME=${IOTDB_HOME} -DIOTDB_CONF=${IOTDB_CONF} -Dlogback.configurationFile=${IOTDB_CONF}/logback-sync.xml $IOTDB_DERBY_OPTS $IOTDB_JMX_OPTS -Dname=SyncClient -cp "$CLASSPATH" "$MAIN_CLASS" exit $?
