commit 163db4496d50cae198b80c9d88c14579f6d2e9f3
author Dapeng <sundapeng@cmss.chinamobile.com> Wed Jan 22 18:22:56 2020 +0800
committer Sijie Guo <guosijie@gmail.com> Wed Jan 22 02:22:56 2020 -0800
tree 08495c4e08186ae0547e90a80801065fb9844b68
parent cfb28fe6ef1cb82f7e8e16f3859b02d607555656

bin/bookkeeper shell supports the -conf

### Motivation
`bin/bookkeeper shell ` support `-conf configuration`, but it doesn't work. bk_server.conf is loaded by default, even if the configuration is specified
![image](https://user-images.githubusercontent.com/42792537/70309755-2a534180-1849-11ea-96b0-bd5b07a6b717.png)
Modify `bin/bookkeeper` to specify the configuration file as an absolute path



Reviewers: Enrico Olivelli <eolivelli@gmail.com>, Sijie Guo <None>

This closes #2211 from SunDapeng1/branch-2211

bin/bookkeeper

diff --git a/bin/bookkeeper b/bin/bookkeeper
index ddaae22..4b55d1e 100755
--- a/bin/bookkeeper
+++ b/bin/bookkeeper
@@ -108,16 +108,30 @@
 LOCALBOOKIES_CONFIG_DIR="${LOCALBOOKIES_CONFIG_DIR:-/tmp/localbookies-config}"
 if [ ${COMMAND} == "shell" ]; then
   DEFAULT_LOG_CONF=${BK_HOME}/conf/log4j.shell.properties
-  if [[ $1 == "-localbookie"  ]]; then
-    if [[ $2 == *:* ]];
-    then
-      BOOKIE_CONF=${LOCALBOOKIES_CONFIG_DIR}/$2.conf
-      shift 2
-    else
-      BOOKIE_CONF=${LOCALBOOKIES_CONFIG_DIR}/baseconf.conf
-      shift
-    fi
-  fi
+  LOCALBOOKIE=0
+   while [ $# -gt 0 ]
+    do
+       opt="$1"
+       case $opt in
+         (-conf)
+            BOOKIE_CONF="$2"
+            shift 2
+         ;;
+         (-localbookie)
+            LOCALBOOKIE=1
+            if [[ $2 == *:* ]];
+            then
+               LOCALBOOKIE_CONF=${LOCALBOOKIES_CONFIG_DIR}/$2.conf
+               shift 2
+            else
+               LOCALBOOKIE_CONF=${LOCALBOOKIES_CONFIG_DIR}/baseconf.conf
+               shift
+            fi
+         ;;
+         (*)
+         ;;
+       esac
+    done
 fi
 
 if [ -z "$BOOKIE_ZK_CONF" ]; then
@@ -172,7 +186,11 @@
     exec $JAVA $OPTS -Dbookkeeper.log.file=$BOOKIE_LOG_FILE org.apache.zookeeper.server.quorum.QuorumPeerMain $BOOKIE_ZK_CONF $@
 elif [ ${COMMAND} == "shell" ]; then
   ENTRY_FORMATTER_ARG="-DentryFormatterClass=${ENTRY_FORMATTER_CLASS:-org.apache.bookkeeper.util.StringEntryFormatter}"
-  exec ${JAVA} ${OPTS} ${ENTRY_FORMATTER_ARG} org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@
+  if [ ${LOCALBOOKIE} == 1 ]; then
+             exec ${JAVA} ${OPTS} ${ENTRY_FORMATTER_ARG} org.apache.bookkeeper.bookie.BookieShell -conf ${LOCALBOOKIE_CONF} $@
+     else
+             exec ${JAVA} ${OPTS} ${ENTRY_FORMATTER_ARG} org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@
+     fi
 elif [ ${COMMAND} == "help" ]; then
   bookkeeper_help;
 else