go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-01-10 00:29:01 +02:00
Code Issues Releases Activity

add init direct

Browse Source
This commit is contained in:
longXboy 2019-05-23 14:02:27 +08:00
parent 40f5515e85
commit 3c919192d7
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/net/rpc/warden/client.go
View File

@ -18,8 +18,6 @@ import (
"github.com/bilibili/kratos/pkg/net/netutil/breaker" "github.com/bilibili/kratos/pkg/net/netutil/breaker"
"github.com/bilibili/kratos/pkg/net/rpc/warden/balancer/p2c" "github.com/bilibili/kratos/pkg/net/rpc/warden/balancer/p2c"
"github.com/bilibili/kratos/pkg/net/rpc/warden/internal/status" "github.com/bilibili/kratos/pkg/net/rpc/warden/internal/status"
"github.com/bilibili/kratos/pkg/net/rpc/warden/resolver"
"github.com/bilibili/kratos/pkg/net/rpc/warden/resolver/direct"
"github.com/bilibili/kratos/pkg/net/trace" "github.com/bilibili/kratos/pkg/net/trace"
xtime "github.com/bilibili/kratos/pkg/time" xtime "github.com/bilibili/kratos/pkg/time"
@ -156,8 +154,6 @@ func NewConn(target string, opt ...grpc.DialOption) (*grpc.ClientConn, error) {
// NewClient returns a new blank Client instance with a default client interceptor. // NewClient returns a new blank Client instance with a default client interceptor.
// opt can be used to add grpc dial options. // opt can be used to add grpc dial options.
func NewClient(conf *ClientConfig, opt ...grpc.DialOption) *Client { func NewClient(conf *ClientConfig, opt ...grpc.DialOption) *Client {
// Do not initialize in the registration, otherwise it may cause the resvoler in the business code to not register.
resolver.Register(direct.New())
c := new(Client) c := new(Client)
if err := c.SetConfig(conf); err != nil { if err := c.SetConfig(conf); err != nil {
panic(err) panic(err)
@ -171,8 +167,6 @@ func NewClient(conf *ClientConfig, opt ...grpc.DialOption) *Client {
// DefaultClient returns a new default Client instance with a default client interceptor and default dialoption. // DefaultClient returns a new default Client instance with a default client interceptor and default dialoption.
// opt can be used to add grpc dial options. // opt can be used to add grpc dial options.
func DefaultClient() *Client { func DefaultClient() *Client {
// Do not initialize in the registration, otherwise it may cause the resvoler in the business code to not register.
resolver.Register(direct.New())
_once.Do(func() { _once.Do(func() {
_defaultClient = NewClient(nil) _defaultClient = NewClient(nil)
}) })

3
pkg/net/rpc/warden/server.go
View File

@ -19,6 +19,8 @@ import (
//this package is for json format response //this package is for json format response
_ "github.com/bilibili/kratos/pkg/net/rpc/warden/internal/encoding/json" _ "github.com/bilibili/kratos/pkg/net/rpc/warden/internal/encoding/json"
"github.com/bilibili/kratos/pkg/net/rpc/warden/internal/status" "github.com/bilibili/kratos/pkg/net/rpc/warden/internal/status"
"github.com/bilibili/kratos/pkg/net/rpc/warden/resolver"
"github.com/bilibili/kratos/pkg/net/rpc/warden/resolver/direct"
"github.com/pkg/errors" "github.com/pkg/errors"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -135,6 +137,7 @@ func (s *Server) handle() grpc.UnaryServerInterceptor {
func init() { func init() {
addFlag(flag.CommandLine) addFlag(flag.CommandLine)
resolver.Register(direct.New())
} }
func addFlag(fs *flag.FlagSet) { func addFlag(fs *flag.FlagSet) {