diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2017-09-21 13:06:26 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2017-09-21 13:06:26 +0000 |
| commit | 8c1043ce221e7162e5d35f522e34ba5bb01d8e82 (patch) | |
| tree | af4706c3c8b5ef2435e2f0239ceff04f254990a5 /vespabase | |
| parent | d825bb328c94e138ea87301282c85cc4edb5e585 (diff) | |
ensure error messages are propagated
* this should ensure that failures to start send any
error messages back so they are available. Tested
both in the docker and the systemd startup cases.
Diffstat (limited to 'vespabase')
| -rwxr-xr-x | vespabase/src/vespa-start-configserver.sh | 7 | ||||
| -rwxr-xr-x | vespabase/src/vespa-start-services.sh | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh index cba6cbfd740..8473ec74a92 100755 --- a/vespabase/src/vespa-start-configserver.sh +++ b/vespabase/src/vespa-start-configserver.sh @@ -61,11 +61,8 @@ findroot ${VESPA_HOME}/bin/vespa-prestart.sh || exit 1 willrun=${VESPA_HOME}/libexec/vespa/start-configserver if [ -x $willrun ]; then - echo "Starting $willrun as a background process." >&2 - exec </dev/null - exec >/dev/null 2>&1 - nohup $willrun & - exit 0 + echo "Starting $willrun" >&2 + exec $willrun fi echo "FATAL cannot run: $willrun" exit 1 diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh index e3cdf855850..ccc6c74c856 100755 --- a/vespabase/src/vespa-start-services.sh +++ b/vespabase/src/vespa-start-services.sh @@ -61,11 +61,8 @@ findroot ${VESPA_HOME}/bin/vespa-prestart.sh || exit 1 willrun=${VESPA_HOME}/libexec/vespa/start-vespa-base.sh if [ -x $willrun ]; then - echo "Starting $willrun as a background process." >&2 - exec </dev/null - exec >/dev/null 2>&1 - nohup $willrun & - exit 0 + echo "Starting $willrun" >&2 + exec $willrun fi echo "FATAL cannot run: $willrun" exit 1 |