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

fix nats clients for audit and notifications

Browse Source
This commit is contained in:
Willy Kloucek
2022-03-11 09:02:08 +01:00
parent 1271b67758
commit 6571d42377
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
audit/pkg/command/server.go
View File

@@ -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
}

12
notifications/pkg/command/server.go
View File

@@ -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
}