This is an automated email from the ASF dual-hosted git repository.
miao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 3cca91d2e51 fixed start cli output log issue (#12483)
3cca91d2e51 is described below
commit 3cca91d2e51628426f81e12256f32ad9cec2e295
Author: CloudWise-Lukemiao <[email protected]>
AuthorDate: Wed May 8 14:08:02 2024 +0800
fixed start cli output log issue (#12483)
Co-authored-by: luke.miao <[email protected]>
---
distribution/src/assembly/all.xml | 12 +++++++-----
distribution/src/assembly/cli.xml | 12 +++++++-----
.../conf/{logback-cli.xml => logback-backup.xml} | 0
.../cli/src/assembly/resources/conf/logback-cli.xml | 19 +------------------
.../cli/src/assembly/resources/tools/backup.bat | 2 +-
.../cli/src/assembly/resources/tools/backup.sh | 2 +-
6 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/distribution/src/assembly/all.xml
b/distribution/src/assembly/all.xml
index 5768f197563..028af358eac 100644
--- a/distribution/src/assembly/all.xml
+++ b/distribution/src/assembly/all.xml
@@ -88,11 +88,6 @@
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory>
<fileMode>0755</fileMode>
</fileSet>
- <fileSet>
- <outputDirectory>conf</outputDirectory>
-
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf</directory>
- <fileMode>0755</fileMode>
- </fileSet>
<!-- <fileSet>-->
<!-- <outputDirectory>datanode</outputDirectory>-->
<!--
<directory>${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/datanode</directory>-->
@@ -102,6 +97,13 @@
<!--
<directory>${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode</directory>-->
<!-- </fileSet>-->
</fileSets>
+ <files>
+ <file>
+
<source>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0755</fileMode>
+ </file>
+ </files>
<!-- <files>-->
<!-- <file>-->
<!--
<source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source>-->
diff --git a/distribution/src/assembly/cli.xml
b/distribution/src/assembly/cli.xml
index 0258de92a24..3566b472148 100644
--- a/distribution/src/assembly/cli.xml
+++ b/distribution/src/assembly/cli.xml
@@ -42,17 +42,19 @@
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory>
<fileMode>0755</fileMode>
</fileSet>
- <fileSet>
- <outputDirectory>conf</outputDirectory>
-
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf</directory>
- <fileMode>0755</fileMode>
- </fileSet>
<fileSet>
<outputDirectory>tools</outputDirectory>
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
+ <files>
+ <file>
+
<source>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0755</fileMode>
+ </file>
+ </files>
<componentDescriptors>
<componentDescriptor>common-files.xml</componentDescriptor>
</componentDescriptors>
diff --git a/iotdb-client/cli/src/assembly/resources/conf/logback-cli.xml
b/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml
similarity index 100%
copy from iotdb-client/cli/src/assembly/resources/conf/logback-cli.xml
copy to iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml
diff --git a/iotdb-client/cli/src/assembly/resources/conf/logback-cli.xml
b/iotdb-client/cli/src/assembly/resources/conf/logback-cli.xml
index 78fa22572f0..1f80786a9c5 100644
--- a/iotdb-client/cli/src/assembly/resources/conf/logback-cli.xml
+++ b/iotdb-client/cli/src/assembly/resources/conf/logback-cli.xml
@@ -26,24 +26,7 @@
<level>ERROR</level>
</filter>
</appender>
- <appender class="ch.qos.logback.core.rolling.RollingFileAppender"
name="backup">
- <Encoding>UTF-8</Encoding>
- <file>${IOTDB_HOME}/logs/log_backup.log</file>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-backup-%d{yyyyMMdd}.log.gz</fileNamePattern>
- <maxHistory>30</maxHistory>
- </rollingPolicy>
- <append>true</append>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
- <charset>utf-8</charset>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>INFO</level>
- </filter>
- </appender>
- <root level="all">
+ <root level="error">
<appender-ref ref="stdout"/>
- <appender-ref ref="backup"/>
</root>
</configuration>
diff --git a/iotdb-client/cli/src/assembly/resources/tools/backup.bat
b/iotdb-client/cli/src/assembly/resources/tools/backup.bat
index 315fd44e53c..13178b7f9bb 100644
--- a/iotdb-client/cli/src/assembly/resources/tools/backup.bat
+++ b/iotdb-client/cli/src/assembly/resources/tools/backup.bat
@@ -100,7 +100,7 @@ if not exist "%logsDir%" (
)
set IOTDB_CLI_CONF=%IOTDB_HOME%\conf
-set
"iotdb_cli_params=-Dlogback.configurationFile=!IOTDB_CLI_CONF!\logback-cli.xml"
+set
"iotdb_cli_params=-Dlogback.configurationFile=!IOTDB_CLI_CONF!\logback-backup.xml"
start /B "" cmd /C "("%JAVA_HOME%\bin\java" -DIOTDB_HOME=!IOTDB_HOME!
!iotdb_cli_params! !JAVA_OPTS! -cp !CLASSPATH! !MAIN_CLASS! %*) > nul 2>&1"
exit /b
diff --git a/iotdb-client/cli/src/assembly/resources/tools/backup.sh
b/iotdb-client/cli/src/assembly/resources/tools/backup.sh
index 6d605812825..a77a0e3c489 100644
--- a/iotdb-client/cli/src/assembly/resources/tools/backup.sh
+++ b/iotdb-client/cli/src/assembly/resources/tools/backup.sh
@@ -130,5 +130,5 @@ if [ ! -d "$logs_dir" ]; then
fi
IOTDB_CLI_CONF=${IOTDB_HOME}/conf
-iotdb_cli_params="-Dlogback.configurationFile=${IOTDB_CLI_CONF}/logback-cli.xml"
+iotdb_cli_params="-Dlogback.configurationFile=${IOTDB_CLI_CONF}/logback-backup.xml"
exec nohup "$JAVA" -DIOTDB_HOME=${IOTDB_HOME} $iotdb_cli_params -cp
"$CLASSPATH" "$MAIN_CLASS" "$@" 2>&1 > /dev/null <&- &
