You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/08/25 09:22:50 UTC
[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-4230]add checking iotdb.in.sh file, add iotdb_log_dir system variable (#7119)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 0497a13388 [To rel/0.13][IOTDB-4230]add checking iotdb.in.sh file, add iotdb_log_dir system variable (#7119)
0497a13388 is described below
commit 0497a1338862dcb23ace5f4a97253b7a08d22f6f
Author: Xiangdong Huang <hx...@apache.org>
AuthorDate: Thu Aug 25 17:22:43 2022 +0800
[To rel/0.13][IOTDB-4230]add checking iotdb.in.sh file, add iotdb_log_dir system variable (#7119)
---
cli/src/assembly/resources/sbin/start-cli.sh | 4 +-
server/src/assembly/resources/conf/logback.xml | 52 +++++++++++-----------
server/src/assembly/resources/sbin/start-server.sh | 29 +++++++++++-
3 files changed, 56 insertions(+), 29 deletions(-)
diff --git a/cli/src/assembly/resources/sbin/start-cli.sh b/cli/src/assembly/resources/sbin/start-cli.sh
index 20fb4506a0..00742eb82e 100644
--- a/cli/src/assembly/resources/sbin/start-cli.sh
+++ b/cli/src/assembly/resources/sbin/start-cli.sh
@@ -25,7 +25,9 @@ if [ -z "${IOTDB_HOME}" ]; then
export IOTDB_HOME="$(cd "`dirname "$0"`"/..; pwd)"
fi
-IOTDB_CLI_CONF=${IOTDB_HOME}/conf
+if [ -z "${IOTDB_CLI_CONF}" ]; then
+ IOTDB_CLI_CONF=${IOTDB_HOME}/conf
+fi
MAIN_CLASS=org.apache.iotdb.cli.Cli
diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback.xml
index fc779b7716..7349c2b0b2 100644
--- a/server/src/assembly/resources/conf/logback.xml
+++ b/server/src/assembly/resources/conf/logback.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_LOG_DIR}/log_error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-error-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-error-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -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_LOG_DIR}/log_warn.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-warn-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-warn-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -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_LOG_DIR}/log_info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-info-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-info-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -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_LOG_DIR}/log_debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -100,9 +100,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILETRACE">
- <file>${IOTDB_HOME}/logs/log_trace.log</file>
+ <file>${IOTDB_LOG_DIR}/log_trace.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-trace-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-trace-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -130,9 +130,9 @@
</appender>
<!-- a log appender that collect all log records whose level is greater than debug-->
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEALL">
- <file>${IOTDB_HOME}/logs/log_all.log</file>
+ <file>${IOTDB_LOG_DIR}/log_all.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-all-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-all-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -147,9 +147,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILE_COST_MEASURE">
- <file>${IOTDB_HOME}/logs/log_measure.log</file>
+ <file>${IOTDB_LOG_DIR}/log_measure.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-measure-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -164,9 +164,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="SYNC">
- <file>${IOTDB_HOME}/logs/log_sync.log</file>
+ <file>${IOTDB_LOG_DIR}/log_sync.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-sync-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-sync-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -181,9 +181,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="AUDIT">
- <file>${IOTDB_HOME}/logs/log_audit.log</file>
+ <file>${IOTDB_LOG_DIR}/log_audit.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-audit-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-audit-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -198,9 +198,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY_DEBUG">
- <file>${IOTDB_HOME}/logs/log_query_debug.log</file>
+ <file>${IOTDB_LOG_DIR}/log_query_debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-query-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-query-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -215,9 +215,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="SLOW_SQL">
- <file>${IOTDB_HOME}/logs/log_slow_sql.log</file>
+ <file>${IOTDB_LOG_DIR}/log_slow_sql.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-slow-sql-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-slow-sql-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -232,9 +232,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY_FREQUENCY">
- <file>${IOTDB_HOME}/logs/log_query_frequency.log</file>
+ <file>${IOTDB_LOG_DIR}/log_query_frequency.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-query-frequency-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-query-frequency-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -249,9 +249,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="COMPACTION">
- <file>${IOTDB_HOME}/logs/log_compaction.log</file>
+ <file>${IOTDB_LOG_DIR}/log_compaction.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-compaction-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_LOG_DIR}/log-compaction-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
diff --git a/server/src/assembly/resources/sbin/start-server.sh b/server/src/assembly/resources/sbin/start-server.sh
index c1c44f3fbc..e840f42eb4 100755
--- a/server/src/assembly/resources/sbin/start-server.sh
+++ b/server/src/assembly/resources/sbin/start-server.sh
@@ -23,12 +23,37 @@ echo ---------------------
echo Starting IoTDB
echo ---------------------
+
+if [ "x$IOTDB_INCLUDE" = "x" ]; then
+ # Locations (in order) to use when searching for an include file.
+ for include in "`dirname "$0"`/iotdb.in.sh" \
+ "$HOME/.iotdb.in.sh" \
+ /usr/share/iotdb/iotdb.in.sh \
+ /etc/iotdb/iotdb.in.sh \
+ /opt/iotdb/iotdb.in.sh; do
+ if [ -r "$include" ]; then
+ . "$include"
+ break
+ fi
+ done
+# ...otherwise, source the specified include.
+elif [ -r "$IOTDB_INCLUDE" ]; then
+ . "$IOTDB_INCLUDE"
+fi
+
+
if [ -z "${IOTDB_HOME}" ]; then
export IOTDB_HOME="`dirname "$0"`/.."
fi
-IOTDB_CONF=${IOTDB_HOME}/conf
-# IOTDB_LOGS=${IOTDB_HOME}/logs
+if [ -z "${IOTDB_CONF}" ]; then
+ export IOTDB_CONF=${IOTDB_HOME}/conf
+fi
+
+if [ -z "${IOTDB_LOG_DIR}" ]; then
+ export IOTDB_LOG_DIR=${IOTDB_HOME}/logs
+fi
+
is_conf_path=false
for arg do