diff options
| author | kuramal <linxxnil@126.com> | 2020-02-18 11:38:58 +0800 |
|---|---|---|
| committer | kuramal <linxxnil@126.com> | 2020-02-18 11:39:09 +0800 |
| commit | 6d1c378cb3e6df566d7e9883c65064787167246c (patch) | |
| tree | 28580c959d89c6bfa5254480653cbefef907ec8a /edgemesh | |
| parent | Change cloudhub configuration access method from Get() to global variable 'Co... (diff) | |
| download | kubeedge-6d1c378cb3e6df566d7e9883c65064787167246c.tar.gz | |
Change edgemesh configuration access method from Get() to global variable 'Config'
Signed-off-by: kuramal <linxxnil@126.com>
Diffstat (limited to 'edgemesh')
| -rw-r--r-- | edgemesh/pkg/config/config.go | 8 | ||||
| -rw-r--r-- | edgemesh/pkg/resolver/resolver.go | 2 | ||||
| -rw-r--r-- | edgemesh/pkg/server/server.go | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/edgemesh/pkg/config/config.go b/edgemesh/pkg/config/config.go index e066dbb76..d5b8cbca8 100644 --- a/edgemesh/pkg/config/config.go +++ b/edgemesh/pkg/config/config.go @@ -6,7 +6,7 @@ import ( "github.com/kubeedge/kubeedge/pkg/apis/edgecore/v1alpha1" ) -var c Configure +var Config Configure var once sync.Once type Configure struct { @@ -15,12 +15,8 @@ type Configure struct { func InitConfigure(e *v1alpha1.EdgeMesh) { once.Do(func() { - c = Configure{ + Config = Configure{ EdgeMesh: *e, } }) } - -func Get() *Configure { - return &c -} diff --git a/edgemesh/pkg/resolver/resolver.go b/edgemesh/pkg/resolver/resolver.go index bf180148a..f35da0a3a 100644 --- a/edgemesh/pkg/resolver/resolver.go +++ b/edgemesh/pkg/resolver/resolver.go @@ -60,7 +60,7 @@ func (resolver *MyResolver) Resolve(data chan []byte, stop chan interface{}, inv i.SourceServiceID = "" i.Protocol = "rest" i.Args = req - i.Strategy = config.Get().LBStrategy + i.Strategy = config.Config.LBStrategy i.Reply = &http.Response{} invCallback("http", *i) } diff --git a/edgemesh/pkg/server/server.go b/edgemesh/pkg/server/server.go index 7545713a4..5a93166af 100644 --- a/edgemesh/pkg/server/server.go +++ b/edgemesh/pkg/server/server.go @@ -31,7 +31,7 @@ func Start() { control.Init(opts) opt := registry.Options{} registry.DefaultServiceDiscoveryService = edgeregistry.NewServiceDiscovery(opt) - myStrategy := meshconfig.Get().LBStrategy + myStrategy := meshconfig.Config.LBStrategy loadbalancer.InstallStrategy(myStrategy, func() loadbalancer.Strategy { switch myStrategy { case "RoundRobin": |