update bootstrap section of scripts

1 files changed, 12 insertions, 0 deletions

diff --git a/jdisc_core/src/main/perl/vespa-jdisc-logfmt b/jdisc_core/src/main/perl/vespa-jdisc-logfmt
index 4d66dda027e..dcada283fc9 100755
--- a/jdisc_core/src/main/perl/vespa-jdisc-logfmt
+++ b/jdisc_core/src/main/perl/vespa-jdisc-logfmt
@@ -52,9 +52,21 @@ sub findhome {
     die "FATAL: Missing VESPA_HOME environment variable\n";
 }
 
+sub findhost {
+    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
+    my $tmp = $ENV{'VESPA_HOSTNAME'};
+    if (!defined $tmp) {
+        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+    }
+    system("vespa-validate-hostname $tmp");
+    ( $? == 0 ) or die "Could not validate hostname\n";
+}
+
 BEGIN {
     my $tmp = findhome();
     $ENV{'VESPA_HOME'} = $tmp;
+    $tmp = findhost();
+    $ENV{'VESPA_HOSTNAME'} = $tmp;
 }
 my $VESPA_HOME = $ENV{'VESPA_HOME'};