diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-09-15 11:35:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-15 11:35:54 +0200 |
commit | 381033510b992049d55cae9964d942b4b47eb9df (patch) | |
tree | 673ee30dac3d7594b41298241493876d501190a3 | |
parent | 3fe3c64f15774aaf7d2f18d1fa5931a3b1bc16d4 (diff) | |
parent | 595c95fddd8cf48738c495611585dd51e35d8d8c (diff) |
Merge pull request #19141 from vespa-engine/bjorncs/fix
Don't mask exit code
-rwxr-xr-x | container-core/src/main/sh/find-pid | 3 | ||||
-rwxr-xr-x | container-core/src/main/sh/vespa-jvm-dumper | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/container-core/src/main/sh/find-pid b/container-core/src/main/sh/find-pid index 88c4c7df2aa..e1c2195c805 100755 --- a/container-core/src/main/sh/find-pid +++ b/container-core/src/main/sh/find-pid @@ -82,7 +82,7 @@ if (( $# != 1 )); then fi readonly config_id=$1 -readonly status=$(vespa-sentinel-cmd list 2>/dev/null | grep "id=\"${config_id}\"") +status=$(vespa-sentinel-cmd list 2>/dev/null | grep "id=\"${config_id}\"") if [ -z "${status}" ]; then echo "No service named '${config_id}'" >&2 exit 1 @@ -97,4 +97,3 @@ if [ -z "$(ps -p ${pid} -o pid=)" ]; then exit 1 fi echo $pid -exit 0 diff --git a/container-core/src/main/sh/vespa-jvm-dumper b/container-core/src/main/sh/vespa-jvm-dumper index a3c41391260..6e829e029b1 100755 --- a/container-core/src/main/sh/vespa-jvm-dumper +++ b/container-core/src/main/sh/vespa-jvm-dumper @@ -89,7 +89,7 @@ if ! [ -d "${output_directory}" -a -w "${output_directory}" ]; then echo "Directory '${output_directory}' is not writable" exit 1 fi -readonly jvm_pid=$($VESPA_HOME/libexec/vespa/find-pid "$service") +jvm_pid=$($VESPA_HOME/libexec/vespa/find-pid "$service") echo "Pid for '${service}' is '${jvm_pid}'" echo "Starting Java Flight Recorder recording" |