fixed the collaboration service GRPC namespace

This commit is contained in:
Roman Perekhod
2024-05-08 16:57:44 +02:00
parent ee1eccba14
commit 612f31bcbb
3 changed files with 8 additions and 4 deletions
@@ -0,0 +1,5 @@
Bugfix: Fix collaboration registry setting
Fixed the collaboration service GRPC namespace
https://github.com/owncloud/ocis/pull/9105
@@ -18,7 +18,7 @@ import (
// There are no explicit requirements for the context, and it will be passed
// without changes to the underlying RegisterService method.
func RegisterOcisService(ctx context.Context, cfg *config.Config, logger log.Logger) error {
svc := registry.BuildGRPCService(cfg.Service.Name, uuid.Must(uuid.NewV4()).String(), cfg.GRPC.Addr, "0.0.0")
svc := registry.BuildGRPCService(cfg.GRPC.Namespace+"."+cfg.Service.Name, uuid.Must(uuid.NewV4()).String(), cfg.GRPC.Addr, "0.0.0")
return registry.RegisterService(ctx, svc, logger)
}
@@ -61,7 +61,7 @@ func RegisterAppProvider(
Name: cfg.App.Name,
Description: cfg.App.Description,
Icon: cfg.App.Icon,
Address: cfg.Service.Name,
Address: cfg.GRPC.Namespace + "." + cfg.Service.Name,
MimeTypes: mimeTypes,
},
}
@@ -2,7 +2,6 @@ package http
import (
"fmt"
stdhttp "net/http"
"github.com/go-chi/chi/v5"
@@ -26,7 +25,7 @@ func Server(opts ...Option) (http.Service, error) {
http.TLSConfig(options.Config.HTTP.TLS),
http.Logger(options.Logger),
http.Namespace(options.Config.HTTP.Namespace),
http.Name(options.Config.Service.Name),
http.Name("wopi"),
http.Version(version.GetString()),
http.Address(options.Config.HTTP.BindAddr),
http.Context(options.Context),