diff options
| author | anyscoding <anyushun@huawei.com> | 2019-08-18 08:21:59 +0800 |
|---|---|---|
| committer | anyscoding <anyushun@huawei.com> | 2019-08-18 08:21:59 +0800 |
| commit | ed973f0b1e39821979dd79f464d2184f77456ff1 (patch) | |
| tree | 1dd048977c04d5242415198b665dfbc06d8cb6ba /edgemesh | |
| parent | Merge pull request #1019 from kadisi/klog (diff) | |
| download | kubeedge-ed973f0b1e39821979dd79f464d2184f77456ff1.tar.gz | |
cleanup edgemesh
1. everything init in pkg/server/server.go, so cmd/edgemesh.go no need
do it
2. go-chassis upgrade to v1.6.1, no need to init HystrixConfig now
Diffstat (limited to 'edgemesh')
| -rw-r--r-- | edgemesh/cmd/conf/chassis.yaml | 1 | ||||
| -rw-r--r-- | edgemesh/cmd/conf/microservice.yaml | 0 | ||||
| -rw-r--r-- | edgemesh/cmd/edgemesh.go | 27 | ||||
| -rw-r--r-- | edgemesh/pkg/server/server.go | 6 |
4 files changed, 0 insertions, 34 deletions
diff --git a/edgemesh/cmd/conf/chassis.yaml b/edgemesh/cmd/conf/chassis.yaml deleted file mode 100644 index 0282147b8..000000000 --- a/edgemesh/cmd/conf/chassis.yaml +++ /dev/null @@ -1 +0,0 @@ -ssl: diff --git a/edgemesh/cmd/conf/microservice.yaml b/edgemesh/cmd/conf/microservice.yaml deleted file mode 100644 index e69de29bb..000000000 --- a/edgemesh/cmd/conf/microservice.yaml +++ /dev/null diff --git a/edgemesh/cmd/edgemesh.go b/edgemesh/cmd/edgemesh.go index 053372d76..c1f2c8380 100644 --- a/edgemesh/cmd/edgemesh.go +++ b/edgemesh/cmd/edgemesh.go @@ -2,18 +2,11 @@ package main import ( "flag" - - "github.com/go-chassis/go-chassis/control" - "github.com/go-chassis/go-chassis/core/config" - "github.com/go-chassis/go-chassis/core/loadbalancer" - "github.com/go-chassis/go-chassis/core/registry" "github.com/kubeedge/kubeedge/edgemesh/pkg" "github.com/spf13/pflag" "k8s.io/klog" _ "github.com/kubeedge/kubeedge/edgemesh/pkg/panel" - edgeregistry "github.com/kubeedge/kubeedge/edgemesh/pkg/registry" - "github.com/kubeedge/kubeedge/edgemesh/pkg/resolver" "github.com/kubeedge/kubeedge/edgemesh/pkg/server" ) @@ -22,28 +15,8 @@ func main() { pflag.CommandLine.AddGoFlagSet(flag.CommandLine) pflag.Parse() - //Initialize the resolvers - r := &resolver.MyResolver{"http"} - resolver.RegisterResolver(r) - pkg.Register() - //Initialize the handlers - // - config.Init() - config.GlobalDefinition.Panel.Infra = "fake" - opts := control.Options{ - Infra: config.GlobalDefinition.Panel.Infra, - Address: config.GlobalDefinition.Panel.Settings["address"], - } - config.GlobalDefinition.Ssl = make(map[string]string) - - control.Init(opts) - opt := registry.Options{} - registry.DefaultServiceDiscoveryService = edgeregistry.NewServiceDiscovery(opt) - loadbalancer.InstallStrategy(loadbalancer.StrategyRandom, func() loadbalancer.Strategy { - return &loadbalancer.RandomStrategy{} - }) //Start server server.StartTCP() } diff --git a/edgemesh/pkg/server/server.go b/edgemesh/pkg/server/server.go index 206b32007..b17c352c1 100644 --- a/edgemesh/pkg/server/server.go +++ b/edgemesh/pkg/server/server.go @@ -21,12 +21,6 @@ func Start() { // // config.GlobalDefinition = &model.GlobalCfg{} - config.HystrixConfig = &model.HystrixConfigWrapper{} - config.HystrixConfig.HystrixConfig = &model.HystrixConfig{} - config.HystrixConfig.HystrixConfig.IsolationProperties = &model.IsolationWrapper{ - Consumer: &model.IsolationSpec{}, - Provider: &model.IsolationSpec{}, - } config.GlobalDefinition.Panel.Infra = "fake" opts := control.Options{ Infra: config.GlobalDefinition.Panel.Infra, |