scip/esctl
1
0
Fork 0
mirror of https://codeberg.org/scip/esctl.git synced 2026-08-24 13:34:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix coredump, register default cluster name

Browse Source
This commit is contained in:
Thomas von Dein
2026-05-11 10:21:43 +02:00
parent 38ed9de0b4
commit 3bd26fde7a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cluster.go
View File

@@ -194,6 +194,12 @@ func ClusterSettingsSet(conf *cfg.Config) *cli.Command {
}, },
Action: func(ctx context.Context, cmd *cli.Command) error { Action: func(ctx context.Context, cmd *cli.Command) error {
args := cmd.Args()
if args.Len() == 0 {
return errors.New("at least one setting must be specified (format: setting:value)")
}
if err := es.ClusterSettingsSet(conf, cmd.Args()); err != nil { if err := es.ClusterSettingsSet(conf, cmd.Args()); err != nil {
return err return err
} }

13
pkg/cfg/config.go
View File

@@ -24,7 +24,6 @@ import (
"net/http" "net/http"
"os" "os"
"github.com/alecthomas/repr"
"github.com/elastic/elastic-transport-go/v8/elastictransport" "github.com/elastic/elastic-transport-go/v8/elastictransport"
"github.com/elastic/go-elasticsearch/v9" "github.com/elastic/go-elasticsearch/v9"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
@@ -90,11 +89,12 @@ func (conf *Config) Init() error {
} }
} else { } else {
if len(conf.Clusters) == 1 { if len(conf.Clusters) == 1 {
for _, cluster := range conf.Clusters { for name, cluster := range conf.Clusters {
conf.DefaultCluster = cluster conf.DefaultCluster = cluster
conf.CurrentCluster = name
} }
} else { } else {
for _, cluster := range conf.Clusters { for name, cluster := range conf.Clusters {
_, err := cluster.ES.Cluster.Health(). _, err := cluster.ES.Cluster.Health().
Header("content-type", "application/json"). Header("content-type", "application/json").
Header("accept", "application/json"). Header("accept", "application/json").
@@ -102,14 +102,15 @@ func (conf *Config) Init() error {
if err == nil { if err == nil {
conf.DefaultCluster = cluster conf.DefaultCluster = cluster
conf.CurrentCluster = name
} }
} }
} }
} }
if conf.Debug { // if conf.Debug {
repr.Println(conf) // repr.Println(conf)
} // }
return nil return nil
} }