aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src/main/sh/start-logd
diff options
context:
space:
mode:
Diffstat (limited to 'configserver/src/main/sh/start-logd')
-rw-r--r--configserver/src/main/sh/start-logd7
1 files changed, 5 insertions, 2 deletions
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
}