You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/10/20 09:59:36 UTC
[iotdb] 04/04: real finish
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch pkg
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f6adbeb141c075c34deacb13700fc3daadff2bbd
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Oct 20 17:59:11 2022 +0800
real finish
---
confignode/src/assembly/resources/sbin/remove-confignode.bat | 2 +-
confignode/src/assembly/resources/sbin/remove-confignode.sh | 2 +-
.../src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java | 2 +-
.../src/assembly/resources/conf/{logback.xml => logback-datanode.xml} | 0
server/src/assembly/resources/sbin/remove-datanode.bat | 2 +-
server/src/assembly/resources/sbin/remove-datanode.sh | 2 +-
server/src/assembly/resources/sbin/start-datanode.bat | 2 +-
server/src/assembly/resources/sbin/start-datanode.sh | 2 +-
server/src/assembly/resources/sbin/start-new-server.bat | 2 +-
server/src/assembly/resources/sbin/start-new-server.sh | 2 +-
server/src/assembly/resources/sbin/start-server.bat | 2 +-
server/src/assembly/resources/sbin/start-server.sh | 2 +-
12 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/confignode/src/assembly/resources/sbin/remove-confignode.bat b/confignode/src/assembly/resources/sbin/remove-confignode.bat
index 0cc7808328..67a78e1114 100644
--- a/confignode/src/assembly/resources/sbin/remove-confignode.bat
+++ b/confignode/src/assembly/resources/sbin/remove-confignode.bat
@@ -87,7 +87,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="%CONFIGNODE_CONF%\logback.xml"^
+ -Dlogback.configurationFile="%CONFIGNODE_CONF%\logback-confignode.xml"^
-DCONFIGNODE_HOME="%CONFIGNODE_HOME%"^
-DCONFIGNODE_CONF="%CONFIGNODE_CONF%"^
-Dsun.jnu.encoding=UTF-8^
diff --git a/confignode/src/assembly/resources/sbin/remove-confignode.sh b/confignode/src/assembly/resources/sbin/remove-confignode.sh
index 4dd8b8d046..6ba7712b5c 100644
--- a/confignode/src/assembly/resources/sbin/remove-confignode.sh
+++ b/confignode/src/assembly/resources/sbin/remove-confignode.sh
@@ -70,7 +70,7 @@ classname=org.apache.iotdb.confignode.service.ConfigNode
launch_service() {
class="$1"
- confignode_parms="-Dlogback.configurationFile=${CONFIGNODE_CONF}/logback.xml"
+ confignode_parms="-Dlogback.configurationFile=${CONFIGNODE_CONF}/logback-confignode.xml"
confignode_parms="$confignode_parms -DCONFIGNODE_HOME=${CONFIGNODE_HOME}"
confignode_parms="$confignode_parms -DCONFIGNODE_CONF=${CONFIGNODE_CONF}"
exec "$JAVA" $illegal_access_params $confignode_parms $CONFIGNODE_JMX_OPTS -cp "$CLASSPATH" "$class" $CONF_PARAMS
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
index 56a27e24e1..27f34f275b 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
@@ -78,7 +78,7 @@ public class DataNodeWrapper extends AbstractNodeWrapper {
final String confDir = workDir + File.separator + "conf";
params.addAll(
Arrays.asList(
- "-Dlogback.configurationFile=" + confDir + File.separator + "logback.xml",
+ "-Dlogback.configurationFile=" + confDir + File.separator + "logback-datanode.xml",
"-DIOTDB_HOME=" + workDir,
"-DTSFILE_HOME=" + workDir,
"-DIOTDB_CONF=" + confDir,
diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback-datanode.xml
similarity index 100%
rename from server/src/assembly/resources/conf/logback.xml
rename to server/src/assembly/resources/conf/logback-datanode.xml
diff --git a/server/src/assembly/resources/sbin/remove-datanode.bat b/server/src/assembly/resources/sbin/remove-datanode.bat
index d157347756..083624b0fd 100644
--- a/server/src/assembly/resources/sbin/remove-datanode.bat
+++ b/server/src/assembly/resources/sbin/remove-datanode.bat
@@ -70,7 +70,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-datanode.xml"^
-DIOTDB_HOME="%IOTDB_HOME%"^
-DTSFILE_HOME="%IOTDB_HOME%"^
-DIOTDB_CONF="%IOTDB_CONF%"
diff --git a/server/src/assembly/resources/sbin/remove-datanode.sh b/server/src/assembly/resources/sbin/remove-datanode.sh
index 8804edb173..749a8da0e3 100644
--- a/server/src/assembly/resources/sbin/remove-datanode.sh
+++ b/server/src/assembly/resources/sbin/remove-datanode.sh
@@ -61,7 +61,7 @@ classname=org.apache.iotdb.db.service.DataNode
launch_service()
{
class="$1"
- iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback.xml"
+ iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback-datanode.xml"
iotdb_parms="$iotdb_parms -DIOTDB_HOME=${IOTDB_HOME}"
iotdb_parms="$iotdb_parms -DTSFILE_HOME=${IOTDB_HOME}"
iotdb_parms="$iotdb_parms -DIOTDB_CONF=${IOTDB_CONF}"
diff --git a/server/src/assembly/resources/sbin/start-datanode.bat b/server/src/assembly/resources/sbin/start-datanode.bat
index 25f00f337d..58654e7957 100755
--- a/server/src/assembly/resources/sbin/start-datanode.bat
+++ b/server/src/assembly/resources/sbin/start-datanode.bat
@@ -97,7 +97,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-datanode.xml"^
-DIOTDB_HOME="%IOTDB_HOME%"^
-DTSFILE_HOME="%IOTDB_HOME%"^
-DTSFILE_CONF="%IOTDB_CONF%"^
diff --git a/server/src/assembly/resources/sbin/start-datanode.sh b/server/src/assembly/resources/sbin/start-datanode.sh
index 327f7af44a..4cc07b7c71 100755
--- a/server/src/assembly/resources/sbin/start-datanode.sh
+++ b/server/src/assembly/resources/sbin/start-datanode.sh
@@ -87,7 +87,7 @@ classname=org.apache.iotdb.db.service.DataNode
launch_service()
{
class="$1"
- iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback.xml"
+ iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback-datanode.xml"
iotdb_parms="$iotdb_parms -DIOTDB_HOME=${IOTDB_HOME}"
iotdb_parms="$iotdb_parms -DTSFILE_HOME=${IOTDB_HOME}"
iotdb_parms="$iotdb_parms -DIOTDB_CONF=${IOTDB_CONF}"
diff --git a/server/src/assembly/resources/sbin/start-new-server.bat b/server/src/assembly/resources/sbin/start-new-server.bat
index 759f5dd1e8..f11e22647c 100644
--- a/server/src/assembly/resources/sbin/start-new-server.bat
+++ b/server/src/assembly/resources/sbin/start-new-server.bat
@@ -86,7 +86,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-datanode.xml"^
-DIOTDB_HOME="%IOTDB_HOME%"^
-DTSFILE_HOME="%IOTDB_HOME%"^
-DTSFILE_CONF="%IOTDB_CONF%"^
diff --git a/server/src/assembly/resources/sbin/start-new-server.sh b/server/src/assembly/resources/sbin/start-new-server.sh
index 6a8557e308..ad7ced776d 100644
--- a/server/src/assembly/resources/sbin/start-new-server.sh
+++ b/server/src/assembly/resources/sbin/start-new-server.sh
@@ -72,7 +72,7 @@ classname=org.apache.iotdb.db.service.NewIoTDB
launch_service()
{
class="$1"
- iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback.xml"
+ iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback-datanode.xml"
iotdb_parms="$iotdb_parms -DIOTDB_HOME=${IOTDB_HOME}"
iotdb_parms="$iotdb_parms -DTSFILE_HOME=${IOTDB_HOME}"
iotdb_parms="$iotdb_parms -DIOTDB_CONF=${IOTDB_CONF}"
diff --git a/server/src/assembly/resources/sbin/start-server.bat b/server/src/assembly/resources/sbin/start-server.bat
index 6fdfba0edb..8b6dea7896 100755
--- a/server/src/assembly/resources/sbin/start-server.bat
+++ b/server/src/assembly/resources/sbin/start-server.bat
@@ -86,7 +86,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-datanode.xml"^
-DIOTDB_HOME="%IOTDB_HOME%"^
-DTSFILE_HOME="%IOTDB_HOME%"^
-DTSFILE_CONF="%IOTDB_CONF%"^
diff --git a/server/src/assembly/resources/sbin/start-server.sh b/server/src/assembly/resources/sbin/start-server.sh
index bf1eb44ce5..a353fa1e4b 100755
--- a/server/src/assembly/resources/sbin/start-server.sh
+++ b/server/src/assembly/resources/sbin/start-server.sh
@@ -72,7 +72,7 @@ classname=org.apache.iotdb.db.service.IoTDB
launch_service()
{
class="$1"
- iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback.xml"
+ iotdb_parms="-Dlogback.configurationFile=${IOTDB_CONF}/logback-datanode.xml"
iotdb_parms="$iotdb_parms -DIOTDB_HOME=${IOTDB_HOME}"
iotdb_parms="$iotdb_parms -DTSFILE_HOME=${IOTDB_HOME}"
iotdb_parms="$iotdb_parms -DIOTDB_CONF=${IOTDB_CONF}"