[bookkeeper] branch master updated: Revert "bin/bookkeeper shell supports the -conf"

[eolivelli]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 3ae3ad4  Revert "bin/bookkeeper shell supports the -conf"
3ae3ad4 is described below

commit 3ae3ad445b9d22b0a6c8b82f8da383955f4d6a4d
Author: Enrico Olivelli <eolive...@gmail.com>
AuthorDate: Sun Feb 16 10:14:02 2020 +0100

    Revert "bin/bookkeeper shell supports the -conf"
    
    This reverts commit 163db4496d50cae198b80c9d88c14579f6d2e9f3.
    
    Descriptions of the changes in this PR:
    Commit 163db4496d50cae198b80c9d88c14579f6d2e9f3 broke "bookkeeper shell" 
command and integration tests are no more able to work
    
    
    
    Reviewers: Sijie Guo <si...@apache.org>
    
    This closes #2265 from eolivelli/fix/revert-bad-fix
---
 bin/bookkeeper | 40 +++++++++++-----------------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/bin/bookkeeper b/bin/bookkeeper
index 4b55d1e..ddaae22 100755
--- a/bin/bookkeeper
+++ b/bin/bookkeeper
@@ -108,30 +108,16 @@ shift
 LOCALBOOKIES_CONFIG_DIR="${LOCALBOOKIES_CONFIG_DIR:-/tmp/localbookies-config}"
 if [ ${COMMAND} == "shell" ]; then
   DEFAULT_LOG_CONF=${BK_HOME}/conf/log4j.shell.properties
-  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
+  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
 fi
 
 if [ -z "$BOOKIE_ZK_CONF" ]; then
@@ -186,11 +172,7 @@ elif [ $COMMAND == "zookeeper" ]; then
     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}"
-  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
+  exec ${JAVA} ${OPTS} ${ENTRY_FORMATTER_ARG} 
org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@
 elif [ ${COMMAND} == "help" ]; then
   bookkeeper_help;
 else