This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new 9dbd39d  fix root config and getty (#1802)
9dbd39d is described below

commit 9dbd39d7b2b05330b684cf87141cc74d6eef10e4
Author: quiet-xu <[email protected]>
AuthorDate: Fri Apr 1 12:55:19 2022 +0800

    fix root config and getty (#1802)
---
 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 3bb47f2..7f3d1aa 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 234fa86..795f723 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"`
        }
 )
 

Reply via email to