From a55d0787ce280428ca9b5f3076ad8e3aafe8126d Mon Sep 17 00:00:00 2001 From: quiet-xu <845144844@qq.com> Date: Thu, 31 Mar 2022 11:00:13 +0800 Subject: [PATCH] fix root config and getty --- config/root_config.go | 1 + remoting/getty/config.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/root_config.go b/config/root_config.go index 3bb47f2f4c..7f3d1aa995 100644 --- a/config/root_config.go +++ b/config/root_config.go @@ -191,6 +191,7 @@ func (rc *RootConfig) Init() error { if err := rc.Shutdown.Init(); err != nil { return err } + SetRootConfig(*rc) // todo if we can remove this from Init in the future? rc.Start() return nil diff --git a/remoting/getty/config.go b/remoting/getty/config.go index 234fa86f1f..795f723545 100644 --- a/remoting/getty/config.go +++ b/remoting/getty/config.go @@ -76,7 +76,7 @@ type ( QueueNumber int `default:"0" yaml:"queue-number" json:"queue-number,omitempty"` // session tcp parameters - GettySessionParam GettySessionParam `required:"true" yaml:",inline" json:",inline"` + GettySessionParam GettySessionParam `required:"true" yaml:"getty-session-param" json:"getty-session-param,omitempty"` } // ClientConfig holds supported types by the multi config package @@ -104,7 +104,7 @@ type ( QueueNumber int `default:"0" yaml:"queue-number" json:"queue-number,omitempty"` // session tcp parameters - GettySessionParam GettySessionParam `required:"true" yaml:",inline" json:",inline"` + GettySessionParam GettySessionParam `required:"true" yaml:"getty-session-param" json:"getty-session-param,omitempty"` } )