Skip to content

fix grpc and rpcx transporters builder no discovery client error #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skeletongo wants to merge 1 commit into from
Closed

fix grpc and rpcx transporters builder no discovery client error #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions transport/grpc/transporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package grpc

import (
"sync"

"github.com/dobyte/due/transport/grpc/v2/internal/client"
"github.com/dobyte/due/transport/grpc/v2/internal/server"
"github.com/dobyte/due/v2/errors"
"github.com/dobyte/due/v2/registry"
"github.com/dobyte/due/v2/transport"
"sync"
)

const name = "grpc"
Expand Down Expand Up @@ -48,10 +50,20 @@ func (t *Transporter) NewServer() (transport.Server, error) {
// 服务直连模式: direct://711baf8d-8a06-11ef-b7df-f4f19e1f0070
// 服务发现模式: discovery://service_name
func (t *Transporter) NewClient(target string) (transport.Client, error) {
var err error

t.once.Do(func() {
t.builder = client.NewBuilder(&t.opts.client)
if t.opts.client.Discovery == nil {
err = errors.New("grpc discovery client is not ready")
} else {
t.builder = client.NewBuilder(&t.opts.client)
}
})

if err != nil {
return nil, err
}

cc, err := t.builder.Build(target)
if err != nil {
return nil, err
Expand Down
16 changes: 14 additions & 2 deletions transport/rpcx/transporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package rpcx

import (
"sync"

"github.com/dobyte/due/transport/rpcx/v2/internal/client"
"github.com/dobyte/due/transport/rpcx/v2/internal/logger"
"github.com/dobyte/due/transport/rpcx/v2/internal/server"
"github.com/dobyte/due/v2/errors"
"github.com/dobyte/due/v2/registry"
"github.com/dobyte/due/v2/transport"
"sync"
)

const name = "rpcx"
Expand Down Expand Up @@ -51,10 +53,20 @@ func (t *Transporter) NewServer() (transport.Server, error) {
// 服务直连模式: direct://711baf8d-8a06-11ef-b7df-f4f19e1f0070
// 服务发现模式: discovery://service_name
func (t *Transporter) NewClient(target string) (transport.Client, error) {
var err error

t.once.Do(func() {
t.builder = client.NewBuilder(&t.opts.client)
if t.opts.client.Discovery == nil {
err = errors.New("rpcx discovery client is not ready")
} else {
t.builder = client.NewBuilder(&t.opts.client)
}
})

if err != nil {
return nil, err
}

cli, err := t.builder.Build(target)
if err != nil {
return nil, err
Expand Down
Loading