From 889884ffcf3d9769e97680db1883435614d1f338 Mon Sep 17 00:00:00 2001 From: Florent BENOIT Date: Mon, 13 Feb 2017 09:21:58 +0100 Subject: [PATCH] fixup! Fix #1682 : Improve UX of graceful shutdown message - base scripts : catch error code of action lifecycle and return it - cha-lib : return error code based on http error code - display better message when auth is required - skip graceful mode when repo is mounted Change-Id: I4e89605fd3c42ad6ba02115c32297d16f49b3ffe Signed-off-by: Florent BENOIT --- dockerfiles/base/scripts/base/commands/cmd_stop.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/base/scripts/base/commands/cmd_stop.sh b/dockerfiles/base/scripts/base/commands/cmd_stop.sh index e26f2045e3b..568d92ed56f 100644 --- a/dockerfiles/base/scripts/base/commands/cmd_stop.sh +++ b/dockerfiles/base/scripts/base/commands/cmd_stop.sh @@ -33,7 +33,7 @@ cmd_stop() { FORCE_STOP=false if [[ "$@" == *"--skip:graceful"* ]]; then FORCE_STOP=true - elif local_repo; then + elif local_repo || local_assembly; then warning "Development mode [skip graceful stop]" FORCE_STOP=true fi @@ -48,7 +48,7 @@ cmd_stop() { error "Authentication failed on the system. Please provide --user and -password values or user --skip:graceful to bypass graceful stop." return 2; elif [[ ${GRACEFUL_STATUS_RESULT} -ne 0 ]]; then - error "We encountered an error -- see $CHE_HOST_CONFIG/cli.log. Graceful stop can be skipped with --skip:graceful" + error "We encountered an error during graceful stop - see $CHE_HOST_CONFIG/cli.log. (hint: --skip:graceful does not wait for workspace stop)" return 2; fi fi