This is an automated email from the ASF dual-hosted git repository.
zhangmingao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new c666fbdb59c fix set BOOKIE_LOG_DIR in bkenv.sh file without effects
(#14725)
c666fbdb59c is described below
commit c666fbdb59c664491a20072a99c7ebbe4b87d986
Author: gaozhangmin <[email protected]>
AuthorDate: Wed Apr 20 18:01:49 2022 +0800
fix set BOOKIE_LOG_DIR in bkenv.sh file without effects (#14725)
Co-authored-by: gavingaozhangmin <[email protected]>
---
bin/pulsar-daemon | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/bin/pulsar-daemon b/bin/pulsar-daemon
index 7039ec8bf3b..16e72b66d70 100755
--- a/bin/pulsar-daemon
+++ b/bin/pulsar-daemon
@@ -51,11 +51,6 @@ then
. "$PULSAR_HOME/conf/pulsar_env.sh"
fi
-PULSAR_LOG_DIR=${PULSAR_LOG_DIR:-"$PULSAR_HOME/logs"}
-PULSAR_LOG_APPENDER=${PULSAR_LOG_APPENDER:-"RollingFile"}
-PULSAR_STOP_TIMEOUT=${PULSAR_STOP_TIMEOUT:-30}
-PULSAR_PID_DIR=${PULSAR_PID_DIR:-$PULSAR_HOME/bin}
-
if [ $# = 0 ]; then
usage
exit 1
@@ -75,6 +70,16 @@ shift
command=$1
shift
+if [[ "$command" = "bookie" ]]
+then
+ PULSAR_LOG_DIR=${BOOKIE_LOG_DIR:-"$PULSAR_HOME/logs"}
+else
+ PULSAR_LOG_DIR=${PULSAR_LOG_DIR:-"$PULSAR_HOME/logs"}
+fi
+PULSAR_LOG_APPENDER=${PULSAR_LOG_APPENDER:-"RollingFile"}
+PULSAR_STOP_TIMEOUT=${PULSAR_STOP_TIMEOUT:-30}
+PULSAR_PID_DIR=${PULSAR_PID_DIR:-$PULSAR_HOME/bin}
+
case $command in
(broker)
echo "doing $startStop $command ..."