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

Dont expose rpc client/server

Browse Source
This commit is contained in:
Asim 2015-05-23 17:40:53 +01:00
parent 3d8dd6e121
commit e192f335da
8 changed files with 73 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/client.go
View File

@ -20,7 +20,7 @@ type options struct {
type Option func(*options)
var (
DefaultClient Client = NewRpcClient()
DefaultClient Client = newRpcClient()
)
func Transport(t transport.Transport) Option {
@ -37,6 +37,10 @@ func CallRemote(ctx context.Context, address string, request Request, response i
return DefaultClient.CallRemote(ctx, address, request, response)
}
func New(opt ...Option) Client {
return newRpcClient(opt...)
}
func NewRequest(service, method string, request interface{}) Request {
return DefaultClient.NewRequest(service, method, request)
}

46
client/rpc_client.go
View File

@ -24,7 +24,7 @@ type headerRoundTripper struct {
r http.RoundTripper
}
type RpcClient struct {
type rpcClient struct {
opts options
}
@ -32,12 +32,28 @@ func init() {
rand.Seed(time.Now().UnixNano())
}
func newRpcClient(opt ...Option) Client {
var opts options
for _, o := range opt {
o(&opts)
}
if opts.transport == nil {
opts.transport = transport.DefaultTransport
}
return &rpcClient{
opts: opts,
}
}
func (t *headerRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
r.Header.Set("X-Client-Version", "1.0")
return t.r.RoundTrip(r)
}
func (r *RpcClient) call(ctx context.Context, address string, request Request, response interface{}) error {
func (r *rpcClient) call(ctx context.Context, address string, request Request, response interface{}) error {
switch request.ContentType() {
case "application/grpc":
cc, err := grpc.Dial(address)
@ -132,12 +148,12 @@ func (r *RpcClient) call(ctx context.Context, address string, request Request, r
return nil
}
func (r *RpcClient) CallRemote(ctx context.Context, address string, request Request, response interface{}) error {
func (r *rpcClient) CallRemote(ctx context.Context, address string, request Request, response interface{}) error {
return r.call(ctx, address, request, response)
}
// TODO: Call(..., opts *Options) error {
func (r *RpcClient) Call(ctx context.Context, request Request, response interface{}) error {
func (r *rpcClient) Call(ctx context.Context, request Request, response interface{}) error {
service, err := registry.GetService(request.Service())
if err != nil {
return errors.InternalServerError("go.micro.client", err.Error())
@ -158,30 +174,14 @@ func (r *RpcClient) Call(ctx context.Context, request Request, response interfac
return r.call(ctx, address, request, response)
}
func (r *RpcClient) NewRequest(service, method string, request interface{}) Request {
func (r *rpcClient) NewRequest(service, method string, request interface{}) Request {
return r.NewProtoRequest(service, method, request)
}
func (r *RpcClient) NewProtoRequest(service, method string, request interface{}) Request {
func (r *rpcClient) NewProtoRequest(service, method string, request interface{}) Request {
return newRpcRequest(service, method, request, "application/octet-stream")
}
func (r *RpcClient) NewJsonRequest(service, method string, request interface{}) Request {
func (r *rpcClient) NewJsonRequest(service, method string, request interface{}) Request {
return newRpcRequest(service, method, request, "application/json")
}
func NewRpcClient(opt ...Option) *RpcClient {
var opts options
for _, o := range opt {
o(&opts)
}
if opts.transport == nil {
opts.transport = transport.DefaultTransport
}
return &RpcClient{
opts: opts,
}
}

18
client/rpc_request.go
View File

@ -1,14 +1,14 @@
package client
type RpcRequest struct {
type rpcRequest struct {
service string
method string
contentType string
request interface{}
}
func newRpcRequest(service, method string, request interface{}, contentType string) *RpcRequest {
return &RpcRequest{
func newRpcRequest(service, method string, request interface{}, contentType string) Request {
return &rpcRequest{
service: service,
method: method,
request: request,
@ -16,22 +16,18 @@ func newRpcRequest(service, method string, request interface{}, contentType stri
}
}
func (r *RpcRequest) ContentType() string {
func (r *rpcRequest) ContentType() string {
return r.contentType
}
func (r *RpcRequest) Service() string {
func (r *rpcRequest) Service() string {
return r.service
}
func (r *RpcRequest) Method() string {
func (r *rpcRequest) Method() string {
return r.method
}
func (r *RpcRequest) Request() interface{} {
func (r *rpcRequest) Request() interface{} {
return r.request
}
func NewRpcRequest(service, method string, request interface{}, contentType string) *RpcRequest {
return newRpcRequest(service, method, request, contentType)
}

2
cmd/cmd.go
View File

@ -114,7 +114,7 @@ func Setup(c *cli.Context) error {
transport.DefaultTransport = transport.NewNatsTransport(tAddrs)
}
client.DefaultClient = client.NewRpcClient()
client.DefaultClient = client.New()
return nil
}

1
examples/service_client.go
View File

@ -12,7 +12,6 @@ import (
func main() {
cmd.Init()
client.DefaultClient = client.NewRpcClient()
// Create new request to service go.micro.service.go-template, method Example.Call
req := client.NewRequest("go.micro.service.template", "Example.Call", &example.Request{
Name: "John",

18
server/rpc_receiver.go
View File

@ -1,29 +1,21 @@
package server
type RpcReceiver struct {
type rpcReceiver struct {
name string
handler interface{}
}
func newRpcReceiver(name string, handler interface{}) *RpcReceiver {
return &RpcReceiver{
func newRpcReceiver(name string, handler interface{}) Receiver {
return &rpcReceiver{
name: name,
handler: handler,
}
}
func (r *RpcReceiver) Name() string {
func (r *rpcReceiver) Name() string {
return r.name
}
func (r *RpcReceiver) Handler() interface{} {
func (r *rpcReceiver) Handler() interface{} {
return r.handler
}
func NewRpcReceiver(handler interface{}) *RpcReceiver {
return newRpcReceiver("", handler)
}
func NewNamedRpcReceiver(name string, handler interface{}) *RpcReceiver {
return newRpcReceiver(name, handler)
}

59
server/rpc_server.go
View File

@ -15,7 +15,7 @@ import (
"golang.org/x/net/context"
)
type RpcServer struct {
type rpcServer struct {
mtx sync.RWMutex
address string
opts options
@ -23,12 +23,26 @@ type RpcServer struct {
exit chan chan error
}
var (
HealthPath = "/_status/health"
RpcPath = "/_rpc"
)
func newRpcServer(address string, opt ...Option) Server {
var opts options
func (s *RpcServer) accept(sock transport.Socket) {
for _, o := range opt {
o(&opts)
}
if opts.transport == nil {
opts.transport = transport.DefaultTransport
}
return &rpcServer{
opts: opts,
address: address,
rpc: rpc.NewServer(),
exit: make(chan chan error),
}
}
func (s *rpcServer) accept(sock transport.Socket) {
var msg transport.Message
if err := sock.Recv(&msg); err != nil {
return
@ -72,26 +86,26 @@ func (s *RpcServer) accept(sock transport.Socket) {
})
}
func (s *RpcServer) Address() string {
func (s *rpcServer) Address() string {
s.mtx.RLock()
address := s.address
s.mtx.RUnlock()
return address
}
func (s *RpcServer) Init() error {
func (s *rpcServer) Init() error {
return nil
}
func (s *RpcServer) NewReceiver(handler interface{}) Receiver {
func (s *rpcServer) NewReceiver(handler interface{}) Receiver {
return newRpcReceiver("", handler)
}
func (s *RpcServer) NewNamedReceiver(name string, handler interface{}) Receiver {
func (s *rpcServer) NewNamedReceiver(name string, handler interface{}) Receiver {
return newRpcReceiver(name, handler)
}
func (s *RpcServer) Register(r Receiver) error {
func (s *rpcServer) Register(r Receiver) error {
if len(r.Name()) > 0 {
s.rpc.RegisterName(r.Name(), r.Handler())
return nil
@ -101,7 +115,7 @@ func (s *RpcServer) Register(r Receiver) error {
return nil
}
func (s *RpcServer) Start() error {
func (s *rpcServer) Start() error {
registerHealthChecker(s)
ts, err := s.opts.transport.Listen(s.address)
@ -125,27 +139,8 @@ func (s *RpcServer) Start() error {
return nil
}
func (s *RpcServer) Stop() error {
func (s *rpcServer) Stop() error {
ch := make(chan error)
s.exit <- ch
return <-ch
}
func NewRpcServer(address string, opt ...Option) *RpcServer {
var opts options
for _, o := range opt {
o(&opts)
}
if opts.transport == nil {
opts.transport = transport.DefaultTransport
}
return &RpcServer{
opts: opts,
address: address,
rpc: rpc.NewServer(),
exit: make(chan chan error),
}
}

6
server/server.go
View File

@ -54,12 +54,16 @@ func Init() error {
}
if DefaultServer == nil {
DefaultServer = NewRpcServer(Address)
DefaultServer = newRpcServer(Address)
}
return DefaultServer.Init()
}
func New(address string, opt ...Option) Server {
return newRpcServer(address, opt...)
}
func NewReceiver(handler interface{}) Receiver {
return DefaultServer.NewReceiver(handler)
}