sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use stream pkg instead server pkg

Browse Source 
Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2022-12-20 09:53:11 +01:00
parent c3041f8cd7
commit b29ffeb3a9
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/audit/pkg/command/server.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
"os" "os"
"github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/events/server" "github.com/cs3org/reva/v2/pkg/events/stream"
"github.com/go-micro/plugins/v4/events/natsjs" "github.com/go-micro/plugins/v4/events/natsjs"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto"
@@ -63,7 +63,7 @@ func Server(cfg *config.Config) *cli.Command {
RootCAs: rootCAPool, RootCAs: rootCAPool,
} }
} }
client, err := server.NewNatsStream( client, err := stream.Nats(
natsjs.TLSConfig(tlsConf), natsjs.TLSConfig(tlsConf),
natsjs.Address(evtsCfg.Endpoint), natsjs.Address(evtsCfg.Endpoint),
natsjs.ClusterID(evtsCfg.Cluster), natsjs.ClusterID(evtsCfg.Cluster),
services/graph/pkg/server/http/server.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
stdhttp "net/http" stdhttp "net/http"
"os" "os"
"github.com/cs3org/reva/v2/pkg/events/server" "github.com/cs3org/reva/v2/pkg/events/stream"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
chimiddleware "github.com/go-chi/chi/v5/middleware" chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/go-micro/plugins/v4/events/natsjs" "github.com/go-micro/plugins/v4/events/natsjs"
@@ -74,7 +74,7 @@ func Server(opts ...Option) (http.Service, error) {
RootCAs: rootCAPool, RootCAs: rootCAPool,
} }
} }
publisher, err = server.NewNatsStream( publisher, err = stream.Nats(
natsjs.TLSConfig(tlsConf), natsjs.TLSConfig(tlsConf),
natsjs.Address(options.Config.Events.Endpoint), natsjs.Address(options.Config.Events.Endpoint),
natsjs.ClusterID(options.Config.Events.Cluster), natsjs.ClusterID(options.Config.Events.Cluster),
services/notifications/pkg/command/server.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"os" "os"
"github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/events/server" "github.com/cs3org/reva/v2/pkg/events/stream"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/go-micro/plugins/v4/events/natsjs" "github.com/go-micro/plugins/v4/events/natsjs"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -62,7 +62,7 @@ func Server(cfg *config.Config) *cli.Command {
RootCAs: rootCAPool, RootCAs: rootCAPool,
} }
} }
client, err := server.NewNatsStream( client, err := stream.Nats(
natsjs.TLSConfig(tlsConf), natsjs.TLSConfig(tlsConf),
natsjs.Address(evtsCfg.Endpoint), natsjs.Address(evtsCfg.Endpoint),
natsjs.ClusterID(evtsCfg.Cluster), natsjs.ClusterID(evtsCfg.Cluster),
services/postprocessing/pkg/command/server.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/cs3org/reva/v2/pkg/events/server" "github.com/cs3org/reva/v2/pkg/events/stream"
"github.com/go-micro/plugins/v4/events/natsjs" "github.com/go-micro/plugins/v4/events/natsjs"
ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto"
"github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config"
@@ -56,7 +56,7 @@ func Server(cfg *config.Config) *cli.Command {
} }
} }
bus, err := server.NewNatsStream( bus, err := stream.Nats(
natsjs.TLSConfig(tlsConf), natsjs.TLSConfig(tlsConf),
natsjs.Address(evtsCfg.Endpoint), natsjs.Address(evtsCfg.Endpoint),
natsjs.ClusterID(evtsCfg.Cluster), natsjs.ClusterID(evtsCfg.Cluster),
services/search/pkg/service/grpc/v0/service.go
+2 -2
View File
@@ -14,7 +14,7 @@ import (
ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" ctxpkg "github.com/cs3org/reva/v2/pkg/ctx"
revactx "github.com/cs3org/reva/v2/pkg/ctx" revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/errtypes" "github.com/cs3org/reva/v2/pkg/errtypes"
"github.com/cs3org/reva/v2/pkg/events/server" "github.com/cs3org/reva/v2/pkg/events/stream"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/go-micro/plugins/v4/events/natsjs" "github.com/go-micro/plugins/v4/events/natsjs"
"github.com/jellydator/ttlcache/v2" "github.com/jellydator/ttlcache/v2"
@@ -98,7 +98,7 @@ func NewHandler(opts ...Option) (searchsvc.SearchProviderHandler, func(), error)
RootCAs: rootCAPool, RootCAs: rootCAPool,
} }
} }
bus, err := server.NewNatsStream( bus, err := stream.Nats(
natsjs.TLSConfig(tlsConf), natsjs.TLSConfig(tlsConf),
natsjs.Address(cfg.Events.Endpoint), natsjs.Address(cfg.Events.Endpoint),
natsjs.ClusterID(cfg.Events.Cluster), natsjs.ClusterID(cfg.Events.Cluster),