From 073503beb91802b12275cf70a0fdd308150ce3ab Mon Sep 17 00:00:00 2001 From: Ilja Neumann Date: Sat, 5 Jun 2021 20:53:11 +0200 Subject: [PATCH] Use ocis registry for refresh The go-micro registry-singleton ignores the ocis configuration and defaults to mdns --- changelog/unreleased/fix-use-configured-registry | 5 +++++ storage/pkg/service/external/external.go | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 changelog/unreleased/fix-use-configured-registry diff --git a/changelog/unreleased/fix-use-configured-registry b/changelog/unreleased/fix-use-configured-registry new file mode 100644 index 00000000000..19060c3cffa --- /dev/null +++ b/changelog/unreleased/fix-use-configured-registry @@ -0,0 +1,5 @@ +Bugfix: External storage registration used wrong config + +The go-micro registry-singleton ignores the ocis configuration and defaults to mdns + +https://github.com/owncloud/ocis/pull/2120 diff --git a/storage/pkg/service/external/external.go b/storage/pkg/service/external/external.go index 570fc527190..1e14bb69916 100644 --- a/storage/pkg/service/external/external.go +++ b/storage/pkg/service/external/external.go @@ -19,10 +19,10 @@ func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, log Address: addr, Metadata: make(map[string]string), } - r := oregistry.GetRegistry() + ocisRegistry := oregistry.GetRegistry() node.Metadata["broker"] = broker.String() - node.Metadata["registry"] = r.String() + node.Metadata["registry"] = ocisRegistry.String() node.Metadata["server"] = "grpc" node.Metadata["transport"] = "grpc" node.Metadata["protocol"] = "grpc" @@ -37,7 +37,7 @@ func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, log logger.Info().Msgf("registering external service %v@%v", node.Id, node.Address) rOpts := []registry.RegisterOption{registry.RegisterTTL(time.Minute)} - if err := r.Register(service, rOpts...); err != nil { + if err := ocisRegistry.Register(service, rOpts...); err != nil { logger.Fatal().Err(err).Msgf("Registration error for external service %v", serviceID) } @@ -48,14 +48,14 @@ func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, log select { case <-t.C: logger.Debug().Interface("service", service).Msg("refreshing external service-registration") - err := registry.Register(service, rOpts...) + err := ocisRegistry.Register(service, rOpts...) if err != nil { logger.Error().Err(err).Msgf("registration error for external service %v", serviceID) } case <-ctx.Done(): logger.Debug().Interface("service", service).Msg("unregistering") t.Stop() - err := registry.Deregister(service) + err := ocisRegistry.Deregister(service) if err != nil { logger.Err(err).Msgf("Error unregistering external service %v", serviceID) }