mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-03 14:57:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4138 from wkloucek/graph-optional-events

Browse Source 
make graph service events optional
This commit is contained in:
Willy Kloucek
2022-07-15 10:26:51 +02:00
committed by GitHub
parent 7c8a85f54c 7cbd1ad357
commit c76a0da585
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
changelog/unreleased/feature-optional-events-in-graph-service.md Normal file
View File

@@ -0,0 +1,8 @@
Enhancement: Optional events in graph service
We've changed the graph service so that you also can start it without any
event bus.
Therefore you need to set `GRAPH_EVENTS_ENDPOINT` to an empty string.
The graph API will not emit any events in this case.
https://github.com/owncloud/ocis/pull/55555

2
services/graph/pkg/config/config.go
View File

@@ -69,6 +69,6 @@ type Identity struct {
// Events combines the configuration options for the event bus.
type Events struct {
Endpoint string `yaml:"endpoint" env:"GRAPH_EVENTS_ENDPOINT" desc:"The address of the streaming service."`
Endpoint string `yaml:"endpoint" env:"GRAPH_EVENTS_ENDPOINT" desc:"The address of the streaming service. Set to a empty string to disable emitting events."`
Cluster string `yaml:"cluster" env:"GRAPH_EVENTS_CLUSTER" desc:"The clusterID of the streaming service. Mandatory when using the NATS service."`
}

24
services/graph/pkg/server/http/server.go
View File

@@ -12,6 +12,7 @@ import (
svc "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0"
"github.com/pkg/errors"
"go-micro.dev/v4"
"go-micro.dev/v4/events"
)
// Server initializes the http service and server.
@@ -28,15 +29,20 @@ func Server(opts ...Option) (http.Service, error) {
http.Flags(options.Flags...),
)
publisher, err := server.NewNatsStream(
natsjs.Address(options.Config.Events.Endpoint),
natsjs.ClusterID(options.Config.Events.Cluster),
)
if err != nil {
options.Logger.Error().
Err(err).
Msg("Error initializing events publisher")
return http.Service{}, errors.Wrap(err, "could not initialize events publisher")
var publisher events.Stream
if options.Config.Events.Endpoint != "" {
var err error
publisher, err = server.NewNatsStream(
natsjs.Address(options.Config.Events.Endpoint),
natsjs.ClusterID(options.Config.Events.Cluster),
)
if err != nil {
options.Logger.Error().
Err(err).
Msg("Error initializing events publisher")
return http.Service{}, errors.Wrap(err, "could not initialize events publisher")
}
}
handle := svc.NewService(

10
services/graph/pkg/service/v0/graph.go
View File

@@ -91,10 +91,12 @@ func (g Graph) GetGatewayClient() GatewayClient {
}
func (g Graph) publishEvent(ev interface{}) {
if err := events.Publish(g.eventsPublisher, ev); err != nil {
g.logger.Error().
Err(err).
Msg("could not publish user created event")
if g.eventsPublisher != nil {
if err := events.Publish(g.eventsPublisher, ev); err != nil {
g.logger.Error().
Err(err).
Msg("could not publish user created event")
}
}
}