From 6571d42377c44f8658cf699defbbc7c7c2719452 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 11 Mar 2022 09:02:08 +0100 Subject: [PATCH] fix nats clients for audit and notifications --- audit/pkg/command/server.go | 12 +++++++++--- notifications/pkg/command/server.go | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/audit/pkg/command/server.go b/audit/pkg/command/server.go index e74f09ff4b..b440932255 100644 --- a/audit/pkg/command/server.go +++ b/audit/pkg/command/server.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/asim/go-micro/plugins/events/nats/v4" + "github.com/asim/go-micro/plugins/events/natsjs/v4" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events/server" "github.com/owncloud/ocis/audit/pkg/config" @@ -35,11 +35,17 @@ func Server(cfg *config.Config) *cli.Command { defer cancel() evtsCfg := cfg.Events - client, err := server.NewNatsStream(nats.Address(evtsCfg.Endpoint), nats.ClusterID(evtsCfg.Cluster)) + client, err := server.NewNatsStream( + natsjs.Address(evtsCfg.Endpoint), + natsjs.ClusterID(evtsCfg.Cluster), + ) if err != nil { return err } - evts, err := events.Consume(client, evtsCfg.ConsumerGroup, types.RegisteredEvents()...) + evts, err := events.Consume( + client, evtsCfg.ConsumerGroup, + types.RegisteredEvents()..., + ) if err != nil { return err } diff --git a/notifications/pkg/command/server.go b/notifications/pkg/command/server.go index 37bd6375fd..6c3f9f32b0 100644 --- a/notifications/pkg/command/server.go +++ b/notifications/pkg/command/server.go @@ -3,7 +3,7 @@ package command import ( "fmt" - "github.com/asim/go-micro/plugins/events/nats/v4" + "github.com/asim/go-micro/plugins/events/natsjs/v4" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events/server" "github.com/owncloud/ocis/notifications/pkg/channels" @@ -31,11 +31,17 @@ func Server(cfg *config.Config) *cli.Command { } evtsCfg := cfg.Notifications.Events - client, err := server.NewNatsStream(nats.Address(evtsCfg.Endpoint), nats.ClusterID(evtsCfg.Cluster)) + client, err := server.NewNatsStream( + natsjs.Address(evtsCfg.Endpoint), + natsjs.ClusterID(evtsCfg.Cluster), + ) if err != nil { return err } - evts, err := events.Consume(client, evtsCfg.ConsumerGroup, evs...) + evts, err := events.Consume( + client, evtsCfg.ConsumerGroup, + evs..., + ) if err != nil { return err }