unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 281 Wiki Activity

Move selector to client/selector

Browse Source
This commit is contained in:
Asim Aslam 2019-06-21 15:13:54 +01:00
parent c350e19552
commit ca5acba0c6
28 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/handler/api/api.go
View File

@ -9,7 +9,7 @@ import (
api "github.com/micro/go-micro/api/proto" api "github.com/micro/go-micro/api/proto"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/client"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/util/ctx" "github.com/micro/go-micro/util/ctx"
) )

2
api/handler/api/util.go
View File

@ -10,7 +10,7 @@ import (
api "github.com/micro/go-micro/api/proto" api "github.com/micro/go-micro/api/proto"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
func requestToProto(r *http.Request) (*api.Request, error) { func requestToProto(r *http.Request) (*api.Request, error) {

2
api/handler/http/http.go
View File

@ -10,7 +10,7 @@ import (
"github.com/micro/go-micro/api" "github.com/micro/go-micro/api"
"github.com/micro/go-micro/api/handler" "github.com/micro/go-micro/api/handler"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
const ( const (

2
api/handler/rpc/rpc.go
View File

@ -19,7 +19,7 @@ import (
"github.com/micro/go-micro/codec/protorpc" "github.com/micro/go-micro/codec/protorpc"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/util/ctx" "github.com/micro/go-micro/util/ctx"
) )

2
api/handler/web/web.go
View File

@ -13,7 +13,7 @@ import (
"github.com/micro/go-micro/api" "github.com/micro/go-micro/api"
"github.com/micro/go-micro/api/handler" "github.com/micro/go-micro/api/handler"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
const ( const (

2
client/grpc/grpc.go
View File

@ -16,7 +16,7 @@ import (
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/metadata" "github.com/micro/go-micro/metadata"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/transport"
"google.golang.org/grpc" "google.golang.org/grpc"

2
client/grpc/grpc_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/micro/go-micro/client" "github.com/micro/go-micro/client"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/registry/memory" "github.com/micro/go-micro/registry/memory"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
pgrpc "google.golang.org/grpc" pgrpc "google.golang.org/grpc"
pb "google.golang.org/grpc/examples/helloworld/helloworld" pb "google.golang.org/grpc/examples/helloworld/helloworld"
) )

2
client/options.go
View File

@ -7,7 +7,7 @@ import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/broker"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/codec"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/transport"
) )

2
client/rpc_client.go
View File

@ -17,7 +17,7 @@ import (
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/metadata" "github.com/micro/go-micro/metadata"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/transport"
) )

2
client/rpc_client_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/registry/memory" "github.com/micro/go-micro/registry/memory"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
func newTestRegistry() registry.Registry { func newTestRegistry() registry.Registry {

0
selector/common_test.go → client/selector/common_test.go
View File

0
selector/default.go → client/selector/default.go
View File

0
selector/default_test.go → client/selector/default_test.go
View File

2
selector/dns/dns.go → client/selector/dns/dns.go
View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
type dnsSelector struct { type dnsSelector struct {

0
selector/filter.go → client/selector/filter.go
View File

0
selector/filter_test.go → client/selector/filter_test.go
View File

0
selector/options.go → client/selector/options.go
View File

2
selector/registry/options.go → client/selector/registry/options.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
// Set the registry cache ttl // Set the registry cache ttl

2
selector/registry/registry.go → client/selector/registry/registry.go
View File

@ -2,7 +2,7 @@
package registry package registry
import ( import (
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
// NewSelector returns a new registry selector // NewSelector returns a new registry selector

0
selector/selector.go → client/selector/selector.go
View File

2
selector/static/static.go → client/selector/static/static.go
View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
// staticSelector is a static selector // staticSelector is a static selector

0
selector/strategy.go → client/selector/strategy.go
View File

0
selector/strategy_test.go → client/selector/strategy_test.go
View File

6
config/cmd/cmd.go
View File

@ -32,9 +32,9 @@ import (
rmem "github.com/micro/go-micro/registry/memory" rmem "github.com/micro/go-micro/registry/memory"
// selectors // selectors
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/selector/dns" "github.com/micro/go-micro/client/selector/dns"
"github.com/micro/go-micro/selector/static" "github.com/micro/go-micro/client/selector/static"
// transports // transports
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/transport"

2
config/cmd/options.go
View File

@ -6,7 +6,7 @@ import (
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/broker"
"github.com/micro/go-micro/client" "github.com/micro/go-micro/client"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/server"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/transport"
) )

2
options.go
View File

@ -9,7 +9,7 @@ import (
"github.com/micro/go-micro/client" "github.com/micro/go-micro/client"
"github.com/micro/go-micro/config/cmd" "github.com/micro/go-micro/config/cmd"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/server"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/transport"
) )

2
util/http/http.go
View File

@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
func NewRoundTripper(opts ...Option) http.RoundTripper { func NewRoundTripper(opts ...Option) http.RoundTripper {

2
util/http/roundtripper.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/client/selector"
) )
type roundTripper struct { type roundTripper struct {