diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2018-05-16 11:01:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 11:01:00 +0200 |
| commit | d6d34ad8faaeb1e88cd7752e87a065ada92c1133 (patch) | |
| tree | dbc46b54025fc761e30b9cfd73587427e207beee /configserver | |
| parent | 71332378a97fddfb28fe5dcdec07a0ee27e08c33 (diff) | |
| parent | 29ae26cc5efd5aaed408225145f756a8f44a5f47 (diff) | |
Merge pull request #5881 from vespa-engine/arnej/handle-missing-hostname-utils
Arnej/handle missing hostname utils
Diffstat (limited to 'configserver')
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 7 | ||||
| -rw-r--r-- | configserver/src/main/sh/start-logd | 7 | ||||
| -rwxr-xr-x | configserver/src/main/sh/stop-configserver | 7 | ||||
| -rwxr-xr-x | configserver/src/main/sh/vespa-configserver-remove-state | 7 |
4 files changed, 20 insertions, 8 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 8c0ea810a9a..3ada0f2fac5 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index ce0b60a8d8d..2b6ed01f09c 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver index 957fdb249c3..099429eb556 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } diff --git a/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state index e3d348ecefa..faac37d48d4 100755 --- a/configserver/src/main/sh/vespa-configserver-remove-state +++ b/configserver/src/main/sh/vespa-configserver-remove-state @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } |