This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 001ffba modify log directory for shenyu-admin and shenyu-bootstrap
(#2345)
001ffba is described below
commit 001ffba46a2755fb4387a98a1d444e285176408d
Author: civism <[email protected]>
AuthorDate: Fri Nov 12 17:36:34 2021 +0800
modify log directory for shenyu-admin and shenyu-bootstrap (#2345)
* modify log directory for shenyu-admin and shenyu-bootstrap
* modify log output
* modify logback.xml config
---
shenyu-admin/src/main/resources/logback.xml | 6 +++---
shenyu-bootstrap/src/main/resources/logback.xml | 6 +++---
shenyu-dist/shenyu-admin-dist/entrypoint.sh | 3 ---
shenyu-dist/shenyu-admin-dist/src/main/resources/bin/start.sh | 4 ++--
shenyu-dist/shenyu-admin-dist/src/main/resources/logback.xml | 4 ++--
shenyu-dist/shenyu-bootstrap-dist/entrypoint.sh | 3 ---
shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.sh | 4 ++--
shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml | 4 ++--
8 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/shenyu-admin/src/main/resources/logback.xml
b/shenyu-admin/src/main/resources/logback.xml
index e861285..e5cb5dc 100644
--- a/shenyu-admin/src/main/resources/logback.xml
+++ b/shenyu-admin/src/main/resources/logback.xml
@@ -20,7 +20,7 @@
<shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
<statusListener
class="ch.qos.logback.core.status.OnConsoleStatusListener"/>
- <property name="LOG_HOME" value="${log.home:-.}"/>
+ <property name="LOG_HOME" value="${log.home:-./logs}"/>
<property name="LOG_APP_NAME" value="${log.app-name:-shenyu-admin}"/>
<property name="MAX_SINGLE_LOG_FILE_SIZE"
value="${log.max-single-log-file-size:-100MB}"/>
<property name="MAX_LOG_FILE_HISTORY"
value="${log.max-log-file-history:-7}"/>
@@ -47,7 +47,7 @@
<file>${LOG_HOME}/${LOG_APP_NAME}.log</file>
<append>true</append>
<rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
<fileNamePattern>${LOG_HOME}/logs/${LOG_APP_NAME}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+
<fileNamePattern>${LOG_HOME}/${LOG_APP_NAME}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
<maxFileSize>${MAX_SINGLE_LOG_FILE_SIZE}</maxFileSize>
<maxHistory>${MAX_LOG_FILE_HISTORY}</maxHistory>
<totalSizeCap>${LOG_FILE_TOTAL_CAPACITY}</totalSizeCap>
@@ -72,7 +72,7 @@
</filter>
<file>${LOG_HOME}/${LOG_APP_NAME}-error.log</file>
<rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
<fileNamePattern>${LOG_HOME}/logs/${LOG_APP_NAME}.%d{yyyy-MM-dd}-error.%i.log.zip</fileNamePattern>
+
<fileNamePattern>${LOG_HOME}/${LOG_APP_NAME}.%d{yyyy-MM-dd}-error.%i.log.zip</fileNamePattern>
<maxFileSize>${MAX_SINGLE_LOG_FILE_SIZE}</maxFileSize>
<maxHistory>${MAX_LOG_FILE_HISTORY}</maxHistory>
<totalSizeCap>${LOG_FILE_TOTAL_CAPACITY}</totalSizeCap>
diff --git a/shenyu-bootstrap/src/main/resources/logback.xml
b/shenyu-bootstrap/src/main/resources/logback.xml
index f8a5b1d..1164a15 100644
--- a/shenyu-bootstrap/src/main/resources/logback.xml
+++ b/shenyu-bootstrap/src/main/resources/logback.xml
@@ -20,7 +20,7 @@
<shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
<statusListener
class="ch.qos.logback.core.status.OnConsoleStatusListener"/>
- <property name="LOG_HOME" value="${log.home:-.}"/>
+ <property name="LOG_HOME" value="${log.home:-./logs}"/>
<property name="LOG_APP_NAME" value="${log.app-name:-shenyu-bootstrap}"/>
<property name="MAX_SINGLE_LOG_FILE_SIZE"
value="${log.max-single-log-file-size:-100MB}"/>
<property name="MAX_LOG_FILE_HISTORY"
value="${log.max-log-file-history:-7}"/>
@@ -47,7 +47,7 @@
<file>${LOG_HOME}/${LOG_APP_NAME}.log</file>
<append>true</append>
<rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
<fileNamePattern>${LOG_HOME}/logs/${LOG_APP_NAME}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+
<fileNamePattern>${LOG_HOME}/${LOG_APP_NAME}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
<maxFileSize>${MAX_SINGLE_LOG_FILE_SIZE}</maxFileSize>
<maxHistory>${MAX_LOG_FILE_HISTORY}</maxHistory>
<totalSizeCap>${LOG_FILE_TOTAL_CAPACITY}</totalSizeCap>
@@ -72,7 +72,7 @@
</filter>
<file>${LOG_HOME}/${LOG_APP_NAME}-error.log</file>
<rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
<fileNamePattern>${LOG_HOME}/logs/${LOG_APP_NAME}.%d{yyyy-MM-dd}-error.%i.log.zip</fileNamePattern>
+
<fileNamePattern>${LOG_HOME}/${LOG_APP_NAME}.%d{yyyy-MM-dd}-error.%i.log.zip</fileNamePattern>
<maxFileSize>${MAX_SINGLE_LOG_FILE_SIZE}</maxFileSize>
<maxHistory>${MAX_LOG_FILE_HISTORY}</maxHistory>
<totalSizeCap>${LOG_FILE_TOTAL_CAPACITY}</totalSizeCap>
diff --git a/shenyu-dist/shenyu-admin-dist/entrypoint.sh
b/shenyu-dist/shenyu-admin-dist/entrypoint.sh
index 62ee43e..a292fd7 100644
--- a/shenyu-dist/shenyu-admin-dist/entrypoint.sh
+++ b/shenyu-dist/shenyu-admin-dist/entrypoint.sh
@@ -18,7 +18,4 @@
[[ -d ./conf-ext ]] && cp -f ./conf-ext/* ./conf
-mkdir -p ${LOCAL_PATH}/logs
-touch ${LOCAL_PATH}/logs/shenyu-admin.log
-
/bin/sh ${LOCAL_PATH}/bin/start.sh && tail -f
${LOCAL_PATH}/logs/shenyu-admin.log
\ No newline at end of file
diff --git a/shenyu-dist/shenyu-admin-dist/src/main/resources/bin/start.sh
b/shenyu-dist/shenyu-admin-dist/src/main/resources/bin/start.sh
index aa6178e..57a9446 100644
--- a/shenyu-dist/shenyu-admin-dist/src/main/resources/bin/start.sh
+++ b/shenyu-dist/shenyu-admin-dist/src/main/resources/bin/start.sh
@@ -27,7 +27,7 @@ if [ ! -d ${LOGS_DIR} ]; then
mkdir ${LOGS_DIR}
fi
-LOG_FILES=${LOGS_DIR}
+LOG_FILES=${LOGS_DIR}/shenyu-admin.log
EXT_LIB=${DEPLOY_DIR}/ext-lib
PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" | grep -v grep | awk '{print
$2}'`
@@ -43,6 +43,6 @@ JAVA_OPTS=" -server -Xmx2g -Xms2g -Xmn1g -Xss256k
-XX:+DisableExplicitGC -XX:+Us
MAIN_CLASS=org.apache.shenyu.admin.ShenyuAdminBootstrap
echo "Starting the $SERVER_NAME ..."
-nohup java ${JAVA_OPTS} -classpath ${CLASS_PATH} ${MAIN_CLASS} >/dev/null 2>&1
&
+nohup java ${JAVA_OPTS} -classpath ${CLASS_PATH} ${MAIN_CLASS} >> ${LOG_FILES}
2>&1 &
sleep 1
echo "Please check the log files: $LOG_FILES"
diff --git a/shenyu-dist/shenyu-admin-dist/src/main/resources/logback.xml
b/shenyu-dist/shenyu-admin-dist/src/main/resources/logback.xml
index fe1ab7a..e5cb5dc 100644
--- a/shenyu-dist/shenyu-admin-dist/src/main/resources/logback.xml
+++ b/shenyu-dist/shenyu-admin-dist/src/main/resources/logback.xml
@@ -47,7 +47,7 @@
<file>${LOG_HOME}/${LOG_APP_NAME}.log</file>
<append>true</append>
<rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
<fileNamePattern>${LOG_HOME}/logs/${LOG_APP_NAME}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+
<fileNamePattern>${LOG_HOME}/${LOG_APP_NAME}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
<maxFileSize>${MAX_SINGLE_LOG_FILE_SIZE}</maxFileSize>
<maxHistory>${MAX_LOG_FILE_HISTORY}</maxHistory>
<totalSizeCap>${LOG_FILE_TOTAL_CAPACITY}</totalSizeCap>
@@ -72,7 +72,7 @@
</filter>
<file>${LOG_HOME}/${LOG_APP_NAME}-error.log</file>
<rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
<fileNamePattern>${LOG_HOME}/logs/${LOG_APP_NAME}.%d{yyyy-MM-dd}-error.%i.log.zip</fileNamePattern>
+
<fileNamePattern>${LOG_HOME}/${LOG_APP_NAME}.%d{yyyy-MM-dd}-error.%i.log.zip</fileNamePattern>
<maxFileSize>${MAX_SINGLE_LOG_FILE_SIZE}</maxFileSize>
<maxHistory>${MAX_LOG_FILE_HISTORY}</maxHistory>
<totalSizeCap>${LOG_FILE_TOTAL_CAPACITY}</totalSizeCap>
diff --git a/shenyu-dist/shenyu-bootstrap-dist/entrypoint.sh
b/shenyu-dist/shenyu-bootstrap-dist/entrypoint.sh
index 9937005..bfa121b 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/entrypoint.sh
+++ b/shenyu-dist/shenyu-bootstrap-dist/entrypoint.sh
@@ -18,8 +18,5 @@
[[ -d ./conf-ext ]] && cp -f ./conf-ext/* ./conf
-mkdir -p ${LOCAL_PATH}/logs
-touch ${LOCAL_PATH}/logs/shenyu-bootstrap.log
-
/bin/sh ${LOCAL_PATH}/bin/start.sh && tail -f
${LOCAL_PATH}/logs/shenyu-bootstrap.log
diff --git a/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.sh
b/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.sh
index 8bb5948..356dc5a 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.sh
+++ b/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.sh
@@ -27,7 +27,7 @@ if [ ! -d ${LOGS_DIR} ]; then
mkdir ${LOGS_DIR}
fi
-LOG_FILES=${LOGS_DIR}
+LOG_FILES=${LOGS_DIR}/shenyu-bootstrap.log
EXT_LIB=${DEPLOY_DIR}/ext-lib
PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" | grep -v grep | awk '{print
$2}'`
@@ -43,6 +43,6 @@ JAVA_OPTS=" -server -Xmx2g -Xms2g -Xmn1g -Xss256k
-XX:+DisableExplicitGC -XX:+Us
MAIN_CLASS=org.apache.shenyu.bootstrap.ShenyuBootstrapApplication
echo "Starting the $SERVER_NAME ..."
-nohup java ${JAVA_OPTS} -classpath ${CLASS_PATH} ${MAIN_CLASS} >/dev/null 2>&1
&
+nohup java ${JAVA_OPTS} -classpath ${CLASS_PATH} ${MAIN_CLASS} >> ${LOG_FILES}
2>&1 &
sleep 1
echo "Please check the log files: $LOG_FILES"
diff --git a/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml
b/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml
index 3e087d1..1164a15 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml
+++ b/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml
@@ -47,7 +47,7 @@
<file>${LOG_HOME}/${LOG_APP_NAME}.log</file>
<append>true</append>
<rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
<fileNamePattern>${LOG_HOME}/logs/${LOG_APP_NAME}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+
<fileNamePattern>${LOG_HOME}/${LOG_APP_NAME}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
<maxFileSize>${MAX_SINGLE_LOG_FILE_SIZE}</maxFileSize>
<maxHistory>${MAX_LOG_FILE_HISTORY}</maxHistory>
<totalSizeCap>${LOG_FILE_TOTAL_CAPACITY}</totalSizeCap>
@@ -72,7 +72,7 @@
</filter>
<file>${LOG_HOME}/${LOG_APP_NAME}-error.log</file>
<rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-
<fileNamePattern>${LOG_HOME}/logs/${LOG_APP_NAME}.%d{yyyy-MM-dd}-error.%i.log.zip</fileNamePattern>
+
<fileNamePattern>${LOG_HOME}/${LOG_APP_NAME}.%d{yyyy-MM-dd}-error.%i.log.zip</fileNamePattern>
<maxFileSize>${MAX_SINGLE_LOG_FILE_SIZE}</maxFileSize>
<maxHistory>${MAX_LOG_FILE_HISTORY}</maxHistory>
<totalSizeCap>${LOG_FILE_TOTAL_CAPACITY}</totalSizeCap>
