diff options
Diffstat (limited to 'client/go/internal/admin/vespa-wrapper/services/start.go')
| -rw-r--r-- | client/go/internal/admin/vespa-wrapper/services/start.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/client/go/internal/admin/vespa-wrapper/services/start.go b/client/go/internal/admin/vespa-wrapper/services/start.go index 408fc196fec..de658264669 100644 --- a/client/go/internal/admin/vespa-wrapper/services/start.go +++ b/client/go/internal/admin/vespa-wrapper/services/start.go @@ -10,7 +10,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/envvars" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" - "github.com/vespa-engine/vespa/client/go/internal/util" + "github.com/vespa-engine/vespa/client/go/internal/osutil" "github.com/vespa-engine/vespa/client/go/internal/vespa" ) @@ -33,14 +33,14 @@ func StartServices() int { } func checkjava() { - backticks := util.BackTicksWithStderr + backticks := osutil.BackTicksWithStderr out, err := backticks.Run("java", "-version") if err != nil { trace.Warning("cannot run 'java -version'") - util.ExitErr(err) + osutil.ExitErr(err) } if !strings.Contains(out, "64-Bit Server VM") { - util.ExitErr(fmt.Errorf("java must invoke the 64-bit Java VM, but -version says:\n%s\n", out)) + osutil.ExitErr(fmt.Errorf("java must invoke the 64-bit Java VM, but -version says:\n%s\n", out)) } } @@ -53,7 +53,7 @@ func VespaStartServices() int { trace.Debug("common prechecks ok, running in", home, "on", host) vespa.RunPreStart() trace.Debug("prestart ok") - util.TuneResourceLimits() + osutil.TuneResourceLimits() increase_vm_max_map_count() trace.Debug("resource limits ok") checkjava() @@ -64,7 +64,7 @@ func VespaStartServices() int { drop_caches() err := vespa.MaybeSwitchUser("start-services") if err != nil { - util.ExitErr(err) + osutil.ExitErr(err) } return StartServices() } |