aboutsummaryrefslogtreecommitdiffstats
path: root/client/go/internal/admin/clusterstate
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-11-29 15:56:29 +0100
committerMartin Polden <mpolden@mpolden.no>2023-11-29 16:12:02 +0100
commit97e177dad6c1a95272e869b4c769e543c27dce3c (patch)
treee99b1c63beb3bfa4a78885ef918bf117bdcc1b09 /client/go/internal/admin/clusterstate
parentc4ce54613175fa7f54dfe08451d57e932e4be854 (diff)
Rename exit functions
Diffstat (limited to 'client/go/internal/admin/clusterstate')
-rw-r--r--client/go/internal/admin/clusterstate/cluster_state.go2
-rw-r--r--client/go/internal/admin/clusterstate/detect_model.go6
-rw-r--r--client/go/internal/admin/clusterstate/set_node_state.go4
3 files changed, 6 insertions, 6 deletions
diff --git a/client/go/internal/admin/clusterstate/cluster_state.go b/client/go/internal/admin/clusterstate/cluster_state.go
index 52f7c2181b4..6863e0a75d1 100644
--- a/client/go/internal/admin/clusterstate/cluster_state.go
+++ b/client/go/internal/admin/clusterstate/cluster_state.go
@@ -117,6 +117,6 @@ func (model *VespaModelConfig) getClusterState(cluster string) (*ClusterState, *
return &parsedJson, &cc
}
// no success:
- util.JustExitMsg(fmt.Sprint(errs))
+ util.ExitMsg(fmt.Sprint(errs))
panic("unreachable")
}
diff --git a/client/go/internal/admin/clusterstate/detect_model.go b/client/go/internal/admin/clusterstate/detect_model.go
index 0f261526145..d9589575c49 100644
--- a/client/go/internal/admin/clusterstate/detect_model.go
+++ b/client/go/internal/admin/clusterstate/detect_model.go
@@ -21,7 +21,7 @@ func getConfigServerHosts(s string) []string {
got, err := backticks.Run(vespa.FindHome()+"/bin/vespa-print-default", "configservers")
res := strings.Fields(got)
if err != nil || len(res) < 1 {
- util.JustExitMsg("bad configservers: " + got)
+ util.ExitMsg("bad configservers: " + got)
}
trace.Debug("found", len(res), "configservers:", res)
return res
@@ -37,7 +37,7 @@ func getConfigServerPort(i int) int {
i, err = strconv.Atoi(strings.TrimSpace(got))
}
if err != nil || i < 1 {
- util.JustExitMsg("bad configserver_rpc_port: " + got)
+ util.ExitMsg("bad configserver_rpc_port: " + got)
}
trace.Debug("found configservers rpc port:", i)
return i
@@ -62,6 +62,6 @@ func detectModel(opts *Options) *VespaModelConfig {
return parsed
}
}
- util.JustExitMsg("could not get model config")
+ util.ExitMsg("could not get model config")
panic("unreachable")
}
diff --git a/client/go/internal/admin/clusterstate/set_node_state.go b/client/go/internal/admin/clusterstate/set_node_state.go
index a838b43503f..ed120d99218 100644
--- a/client/go/internal/admin/clusterstate/set_node_state.go
+++ b/client/go/internal/admin/clusterstate/set_node_state.go
@@ -80,7 +80,7 @@ func runSetNodeState(opts *Options, args []string) {
}
wanted, err := knownState(args[0])
if err != nil {
- util.JustExitWith(err)
+ util.ExitErr(err)
}
reason := ""
if len(args) > 1 {
@@ -138,7 +138,7 @@ func (cc *ClusterControllerSpec) setNodeUserState(s serviceSpec, wanted KnownSta
}
jsonBytes, err := json.Marshal(request)
if err != nil {
- util.JustExitWith(err)
+ util.ExitErr(err)
}
url := fmt.Sprintf("http://%s:%d/cluster/v2/%s/%s/%d",
cc.host, cc.port,