Skip to content

Commit

Permalink
[release-17.0] Ensure to call servenv.Init when needed (#13638) (#1…
Browse files Browse the repository at this point in the history
…3643)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
  • Loading branch information
vitess-bot[bot] authored Jul 27, 2023
1 parent 907f693 commit 400b506
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions go/cmd/topo2topo/topo2topo.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ func main() {
logutil.RegisterFlags(fs)

servenv.ParseFlags("topo2topo")
servenv.Init()

fromTS, err := topo.OpenServer(fromImplementation, fromServerAddress, fromRoot)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions go/cmd/vtaclcheck/vtaclcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func main() {
defer logutil.Flush()

servenv.ParseFlags("vtaclcheck")
servenv.Init()

err := run()
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions go/cmd/vtbench/vtbench.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ func main() {
})

servenv.ParseFlags("vtbench")
servenv.Init()

defer exit.Recover()

Expand Down
1 change: 1 addition & 0 deletions go/cmd/vtexplain/vtexplain.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ func main() {
defer logutil.Flush()

servenv.ParseFlags("vtexplain")
servenv.Init()
err := parseAndRun()
if err != nil {
fmt.Printf("ERROR: %s\n", err)
Expand Down
1 change: 1 addition & 0 deletions go/cmd/vtorc/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ func main() {
fs.StringVar(&configFile, "config", "", "config file name")
})
servenv.ParseFlags("vtorc")
servenv.Init()
config.UpdateConfigValuesFromFlags()

log.Info("starting vtorc")
Expand Down
1 change: 1 addition & 0 deletions go/cmd/vttestserver/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ func parseFlags() (env vttest.Environment, err error) {

func main() {
cluster, err := runCluster()
servenv.Init()
if err != nil {
log.Fatal(err)
}
Expand Down
1 change: 1 addition & 0 deletions go/cmd/zkctld/zkctld.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ func main() {
defer logutil.Flush()

servenv.ParseFlags("zkctld")
servenv.Init()
zkConfig := zkctl.MakeZkConfigFromString(zkCfg, uint32(myID))
zkd := zkctl.NewZkd(zkConfig)

Expand Down

0 comments on commit 400b506

Please sign in to comment.