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

Strip stream func and rename call wrappers...

Browse Source
This commit is contained in:
Asim 2016-11-07 17:58:34 +00:00
parent 5ee585e77d
commit f3b591d722
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/client_wrapper.go
View File

@ -41,17 +41,11 @@ import (
// CallFunc represents the individual call func // CallFunc represents the individual call func
type CallFunc func(ctx context.Context, address string, req Request, rsp interface{}, opts CallOptions) error type CallFunc func(ctx context.Context, address string, req Request, rsp interface{}, opts CallOptions) error
// StreamFunc represents the individual stream func // CallWrapper is a low level wrapper for the CallFunc
type StreamFunc func(ctx context.Context, address string, req Request, opts CallOptions) (Streamer, error) type CallWrapper func(CallFunc) CallFunc
// Wrapper wraps a client and returns a client // Wrapper wraps a client and returns a client
type Wrapper func(Client) Client type Wrapper func(Client) Client
// StreamWrapper wraps a Stream and returns the equivalent // StreamWrapper wraps a Stream and returns the equivalent
type StreamWrapper func(Streamer) Streamer type StreamWrapper func(Streamer) Streamer
// CallFuncWrapper is a low level wrapper for the CallFunc
type CallFuncWrapper func(CallFunc) CallFunc
// StreamFuncWrapper is a low level wrapper for the StreamFunc
type StreamFuncWrapper func(StreamFunc) StreamFunc

12
client/options.go
View File

@ -53,7 +53,7 @@ type CallOptions struct {
RequestTimeout time.Duration RequestTimeout time.Duration
// Middleware for low level call func // Middleware for low level call func
CallFuncWrappers []CallFuncWrapper CallWrappers []CallWrapper
// Other options for implementations of the interface // Other options for implementations of the interface
// can be stored in a context // can be stored in a context
@ -181,9 +181,9 @@ func Wrap(w Wrapper) Option {
} }
// Adds a Wrapper to the list of CallFunc wrappers // Adds a Wrapper to the list of CallFunc wrappers
func WrapCallFunc(cw ...CallFuncWrapper) Option { func WrapCallFunc(cw ...CallWrapper) Option {
return func(o *Options) { return func(o *Options) {
o.CallOptions.CallFuncWrappers = append(o.CallOptions.CallFuncWrappers, cw...) o.CallOptions.CallWrappers = append(o.CallOptions.CallWrappers, cw...)
} }
} }
@ -226,10 +226,10 @@ func WithSelectOption(so ...selector.SelectOption) CallOption {
} }
} }
// WithCallFuncWrapper is a CallOption which adds to the existing CallFunc wrappers // WithCallWrapper is a CallOption which adds to the existing CallFunc wrappers
func WithCallFuncWrapper(cw ...CallFuncWrapper) CallOption { func WithCallWrapper(cw ...CallWrapper) CallOption {
return func(o *CallOptions) { return func(o *CallOptions) {
o.CallFuncWrappers = append(o.CallFuncWrappers, cw...) o.CallWrappers = append(o.CallWrappers, cw...)
} }
} }

4
client/rpc_client.go
View File

@ -279,8 +279,8 @@ func (r *rpcClient) Call(ctx context.Context, request Request, response interfac
// wrap the call in reverse // wrap the call in reverse
rcall := r.call rcall := r.call
for i := len(callOpts.CallFuncWrappers); i > 0; i-- { for i := len(callOpts.CallWrappers); i > 0; i-- {
rcall = callOpts.CallFuncWrappers[i-1](rcall) rcall = callOpts.CallWrappers[i-1](rcall)
} }
// make the call // make the call