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

always pass in a client

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2021-02-18 10:58:56 +00:00
parent 11ed5e49d8
commit d9f4a4c524
6 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accounts/go.mod
-1
View File
@@ -7,7 +7,6 @@ require (
contrib.go.opencensus.io/exporter/ocagent v0.6.0
contrib.go.opencensus.io/exporter/zipkin v0.1.1
github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210217182006-0f0ace1a44a9
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210217182006-0f0ace1a44a9 // indirect
github.com/asim/go-micro/v3 v3.5.1-0.20210217182006-0f0ace1a44a9
github.com/cs3org/go-cs3apis v0.0.0-20210209082852-35ace33082f5
github.com/cs3org/reva v1.6.0
graph-explorer/go.sum
+1
View File
@@ -138,6 +138,7 @@ github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210217182006-0f0ace1a44
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210217182006-0f0ace1a44a9 h1:wRBB/5jFZCFGnuzP3MfWzqlv7DHpBSn03fjgaCZOaio=
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:Oe0f4zsBx6if1scvMrL/4mNfkD7URaqkvhQWnWogcws=
github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210202145831-070250155285/go.mod h1:FXWwzJ74gGEIY/gOdDHJqCQuago+tLSkcUPayf9daGM=
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:uyEy7qDUtW2lYTnAA9w4hKH+bzotiO1CIm2HHZFn2pg=
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:iCbpezORppbnxDxG/TEAoLsoxkAvEfcq2Fo1WOClNjY=
github.com/asim/go-micro/v3 v3.0.0-20210120135431-d94936f6c97c/go.mod h1:fAeb2KUnD3z4XwtQ91XFxw5zgGKhoTsLc6Ie81QdER4=
github.com/asim/go-micro/v3 v3.5.0 h1:VAmEDB2IdIzPLdgk0bgN6qBe3zHQ5j45SSZfg0e91sY=
graph/go.sum
+1
View File
@@ -143,6 +143,7 @@ github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210217182006-0f0ace1a44
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210217182006-0f0ace1a44a9 h1:wRBB/5jFZCFGnuzP3MfWzqlv7DHpBSn03fjgaCZOaio=
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:Oe0f4zsBx6if1scvMrL/4mNfkD7URaqkvhQWnWogcws=
github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210202145831-070250155285/go.mod h1:FXWwzJ74gGEIY/gOdDHJqCQuago+tLSkcUPayf9daGM=
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:uyEy7qDUtW2lYTnAA9w4hKH+bzotiO1CIm2HHZFn2pg=
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:iCbpezORppbnxDxG/TEAoLsoxkAvEfcq2Fo1WOClNjY=
github.com/asim/go-micro/v3 v3.0.0-20210120135431-d94936f6c97c/go.mod h1:fAeb2KUnD3z4XwtQ91XFxw5zgGKhoTsLc6Ie81QdER4=
github.com/asim/go-micro/v3 v3.5.0 h1:VAmEDB2IdIzPLdgk0bgN6qBe3zHQ5j45SSZfg0e91sY=
idp/go.sum
+1
View File
@@ -146,6 +146,7 @@ github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210217182006-0f0ace1a44
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210217182006-0f0ace1a44a9 h1:wRBB/5jFZCFGnuzP3MfWzqlv7DHpBSn03fjgaCZOaio=
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:Oe0f4zsBx6if1scvMrL/4mNfkD7URaqkvhQWnWogcws=
github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210202145831-070250155285/go.mod h1:FXWwzJ74gGEIY/gOdDHJqCQuago+tLSkcUPayf9daGM=
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:uyEy7qDUtW2lYTnAA9w4hKH+bzotiO1CIm2HHZFn2pg=
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210217182006-0f0ace1a44a9/go.mod h1:iCbpezORppbnxDxG/TEAoLsoxkAvEfcq2Fo1WOClNjY=
github.com/asim/go-micro/v3 v3.0.0-20210120135431-d94936f6c97c/go.mod h1:fAeb2KUnD3z4XwtQ91XFxw5zgGKhoTsLc6Ie81QdER4=
github.com/asim/go-micro/v3 v3.5.0 h1:VAmEDB2IdIzPLdgk0bgN6qBe3zHQ5j45SSZfg0e91sY=
ocis-pkg/service/grpc/service.go
+8 -18
View File
@@ -4,29 +4,16 @@ import (
"strings"
"time"
grpcc "github.com/asim/go-micro/plugins/client/grpc/v3"
"github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/client"
"github.com/asim/go-micro/plugins/server/grpc/v3"
mgrpcc "github.com/asim/go-micro/plugins/client/grpc/v3"
mgrpcs "github.com/asim/go-micro/plugins/server/grpc/v3"
"github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3"
"github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3"
"github.com/asim/go-micro/v3"
"github.com/owncloud/ocis/ocis-pkg/registry"
)
// DefaultClient is a custom ocis grpc configured client.
var DefaultClient = newGrpcClient()
func newGrpcClient() client.Client {
//r := *registry.GetRegistry()
c := grpcc.NewClient(
//grpcc.RequestTimeout(10*time.Second),
//grpcc.Registry(r),
)
return c
}
var DefaultClient = mgrpcc.NewClient()
// Service simply wraps the go-micro grpc service.
type Service struct {
@@ -43,7 +30,10 @@ func NewService(opts ...Option) Service {
Msg("starting server")
mopts := []micro.Option{
micro.Server(grpc.NewServer()),
// first add a server because it will reset any options
micro.Server(mgrpcs.NewServer()),
// also add a client that can be used after initializing the service
micro.Client(mgrpcc.NewClient()),
micro.Address(sopts.Address),
micro.Name(strings.Join([]string{sopts.Namespace, sopts.Name}, ".")),
micro.Version(sopts.Version),
ocis-pkg/service/http/service.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/asim/go-micro/plugins/server/http/v3"
mhttps "github.com/asim/go-micro/plugins/server/http/v3"
"github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/server"
)
@@ -26,7 +26,7 @@ func NewService(opts ...Option) Service {
Msg("starting server")
wopts := []micro.Option{
micro.Server(http.NewServer(server.TLSConfig(sopts.TLSConfig))),
micro.Server(mhttps.NewServer(server.TLSConfig(sopts.TLSConfig))),
micro.Address(sopts.Address),
micro.Name(strings.Join([]string{sopts.Namespace, sopts.Name}, ".")),
micro.Version(sopts.Version),