From f9954bb02232dc16ba3d52bb34454855cbf6ac4d Mon Sep 17 00:00:00 2001 From: Ingmar Aasoja Date: Fri, 29 Jan 2021 11:54:44 +0200 Subject: [PATCH] Remove duplicated code and use existant getRegistry() instead --- ocis-pkg/service/grpc/service.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/ocis-pkg/service/grpc/service.go b/ocis-pkg/service/grpc/service.go index 7c2d5891c7..c520330de5 100644 --- a/ocis-pkg/service/grpc/service.go +++ b/ocis-pkg/service/grpc/service.go @@ -1,7 +1,6 @@ package grpc import ( - "os" "strings" "time" @@ -9,12 +8,8 @@ import ( mclient "github.com/micro/go-micro/v2/client" "github.com/micro/go-micro/v2/client/grpc" - etcdr "github.com/micro/go-micro/v2/registry/etcd" - mdnsr "github.com/micro/go-micro/v2/registry/mdns" - - "github.com/micro/go-micro/v2/registry" - "github.com/micro/go-plugins/wrapper/trace/opencensus/v2" + "github.com/owncloud/ocis/ocis-pkg/registry" "github.com/owncloud/ocis/ocis-pkg/wrapper/prometheus" ) @@ -22,17 +17,7 @@ import ( var DefaultClient = newGrpcClient() func newGrpcClient() mclient.Client { - addresses := strings.Split(os.Getenv("MICRO_REGISTRY_ADDRESS"), ",") - - var r registry.Registry - switch os.Getenv("MICRO_REGISTRY") { - case "etcd": - r = etcdr.NewRegistry( - registry.Addrs(addresses...), - ) - default: - r = mdnsr.NewRegistry() - } + r := *registry.GetRegistry() c := grpc.NewClient( mclient.RequestTimeout(10*time.Second),