mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor registry awareness logic

Browse Source
This commit is contained in:
A.Unger
2020-11-12 09:50:59 +01:00
parent 89ccb8110d
commit bdfea8ee2e
3 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ocis/pkg/command/root.go
View File

@@ -4,14 +4,11 @@ import (
"os"
"strings"
etcdr "github.com/micro/go-micro/v2/registry/etcd"
mdnsr "github.com/micro/go-micro/v2/registry/mdns"
"github.com/micro/go-micro/v2"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-pkg/log"
oregistry "github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/ocis/pkg/config"
"github.com/owncloud/ocis/ocis/pkg/flagset"
"github.com/owncloud/ocis/ocis/pkg/register"
@@ -50,15 +47,7 @@ func Execute() error {
)
}
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 := *oregistry.GetRegistry()
opts := micro.Options{
Registry: r,