Deprecate client/selector (#1767)
* client/{grpc,rpc}: depricate selector (wip)
* {client,cmd}: remove client/selector
* deprecate client/selector
* router/static: fix lookup
* config/cmd: add support for legacy static selector flag
* config/cmd: add support for legacy dns selector flag
			
			
This commit is contained in:
		| @@ -6,9 +6,9 @@ import ( | ||||
|  | ||||
| 	goapi "github.com/micro/go-micro/v2/api" | ||||
| 	"github.com/micro/go-micro/v2/api/handler" | ||||
| 	"github.com/micro/go-micro/v2/api/handler/util" | ||||
| 	api "github.com/micro/go-micro/v2/api/proto" | ||||
| 	"github.com/micro/go-micro/v2/client" | ||||
| 	"github.com/micro/go-micro/v2/client/selector" | ||||
| 	"github.com/micro/go-micro/v2/errors" | ||||
| 	"github.com/micro/go-micro/v2/util/ctx" | ||||
| ) | ||||
| @@ -71,10 +71,8 @@ func (a *apiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | ||||
|  | ||||
| 	// create the context from headers | ||||
| 	cx := ctx.FromRequest(r) | ||||
| 	// create strategy | ||||
| 	so := selector.WithStrategy(strategy(service.Services)) | ||||
|  | ||||
| 	if err := c.Call(cx, req, rsp, client.WithSelectOption(so)); err != nil { | ||||
| 	if err := c.Call(cx, req, rsp, client.WithRouter(util.Router(service.Services))); err != nil { | ||||
| 		w.Header().Set("Content-Type", "application/json") | ||||
| 		ce := errors.Parse(err.Error()) | ||||
| 		switch ce.Code { | ||||
|   | ||||
| @@ -8,8 +8,6 @@ import ( | ||||
| 	"strings" | ||||
|  | ||||
| 	api "github.com/micro/go-micro/v2/api/proto" | ||||
| 	"github.com/micro/go-micro/v2/client/selector" | ||||
| 	"github.com/micro/go-micro/v2/registry" | ||||
| 	"github.com/oxtoacart/bpool" | ||||
| ) | ||||
|  | ||||
| @@ -109,11 +107,3 @@ func requestToProto(r *http.Request) (*api.Request, error) { | ||||
|  | ||||
| 	return req, nil | ||||
| } | ||||
|  | ||||
| // strategy is a hack for selection | ||||
| func strategy(services []*registry.Service) selector.Strategy { | ||||
| 	return func(_ []*registry.Service) selector.Next { | ||||
| 		// ignore input to this function, use services above | ||||
| 		return selector.Random(services) | ||||
| 	} | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user