From 214e656641b12bc769580e53ae6b436378ac1ac3 Mon Sep 17 00:00:00 2001 From: Mic Bowman Date: Fri, 7 Jun 2024 10:22:54 -0600 Subject: [PATCH] small docker fixes to fix loglevel switch in tools Signed-off-by: Mic Bowman --- docker/tools/start_client.sh | 6 ++---- docker/tools/start_services.sh | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docker/tools/start_client.sh b/docker/tools/start_client.sh index ebea4be0..b895d8d7 100755 --- a/docker/tools/start_client.sh +++ b/docker/tools/start_client.sh @@ -26,14 +26,13 @@ SCRIPT_NAME=$(basename ${BASH_SOURCE[-1]} ) # ----------------------------------------------------------------- # Process command line arguments # ----------------------------------------------------------------- -F_LOGLEVEL= F_MODE=build F_INTERFACE= F_LEDGER_URL= -F_USAGE='-i|--interface [hostname] -1|--ledger [url] --loglevel [debug|info|warn] -m|--mode [build|copy|skip]' +F_USAGE='-i|--interface [hostname] -1|--ledger [url] -m|--mode [build|copy|skip]' SHORT_OPTS='i:l:m:' -LONG_OPTS='interface:,ledger:,loglevel:,mode:' +LONG_OPTS='interface:,ledger:,mode:' TEMP=$(getopt -o ${SHORT_OPTS} --long ${LONG_OPTS} -n "${SCRIPT_NAME}" -- "$@") if [ $? != 0 ] ; then echo "Usage: ${SCRIPT_NAME} ${F_USAGE}" >&2 ; exit 1 ; fi @@ -43,7 +42,6 @@ while true ; do case "$1" in -i|--interface) F_INTERFACE="$2" ; shift 2 ;; -l|--ledger) F_LEDGER_URL="$2" ; shift 2 ;; - --loglevel) F_LOGLEVEL="--loglevel $2" ; shift 2 ;; -m|--mode) F_MODE="$2" ; shift 2 ;; --help) echo "Usage: ${SCRIPT_NAME} ${F_USAGE}"; exit 0 ;; --) shift ; break ;; diff --git a/docker/tools/start_services.sh b/docker/tools/start_services.sh index b7bf6853..6aaa581d 100755 --- a/docker/tools/start_services.sh +++ b/docker/tools/start_services.sh @@ -140,9 +140,9 @@ yell start the services # ----------------------------------------------------------------- . ${PDO_INSTALL_ROOT}/bin/activate -try ${PDO_HOME}/bin/ss-start.sh --output ${PDO_HOME}/logs ${F_LOG_LEVEL} ${F_CLEAN} -try ${PDO_HOME}/bin/ps-start.sh --output ${PDO_HOME}/logs ${F_LOG_LEVEL} ${F_CLEAN} -try ${PDO_HOME}/bin/es-start.sh --output ${PDO_HOME}/logs ${F_LOG_LEVEL} ${F_CLEAN} +try ${PDO_HOME}/bin/ss-start.sh --output ${PDO_HOME}/logs ${F_LOGLEVEL} ${F_CLEAN} +try ${PDO_HOME}/bin/ps-start.sh --output ${PDO_HOME}/logs ${F_LOGLEVEL} ${F_CLEAN} +try ${PDO_HOME}/bin/es-start.sh --output ${PDO_HOME}/logs ${F_LOGLEVEL} ${F_CLEAN} # save the site.toml file if the configuration files were generated here if [ "${F_MODE,,}" == "build" ]; then