Adjusting names
This commit is contained in:
parent
d7e4062a0e
commit
092d17a74e
@ -68,8 +68,8 @@ var (
|
|||||||
DefaultClient Client = newRpcClient()
|
DefaultClient Client = newRpcClient()
|
||||||
// DefaultBackoff is the default backoff function for retries
|
// DefaultBackoff is the default backoff function for retries
|
||||||
DefaultBackoff = exponentialBackoff
|
DefaultBackoff = exponentialBackoff
|
||||||
// DefaultCheckIfRetriable is the default check-for-retry function for retries
|
// DefaultRetry is the default check-for-retry function for retries
|
||||||
DefaultCheckIfRetriable = AlwaysRetry
|
DefaultRetry = alwaysRetry
|
||||||
// DefaultRetries is the default number of times a request is tried
|
// DefaultRetries is the default number of times a request is tried
|
||||||
DefaultRetries = 1
|
DefaultRetries = 1
|
||||||
// DefaultRequestTimeout is the default request timeout
|
// DefaultRequestTimeout is the default request timeout
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
package client
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/micro/go-micro/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
type IsRetriableFunc func(err error) bool
|
|
||||||
|
|
||||||
// always retry on error
|
|
||||||
func AlwaysRetry(err error) bool {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func Only500Errors(err error) bool {
|
|
||||||
errorData := errors.Parse(err.Error())
|
|
||||||
|
|
||||||
if(errorData.Code >= 500) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
@ -44,7 +44,7 @@ type CallOptions struct {
|
|||||||
// Backoff func
|
// Backoff func
|
||||||
Backoff BackoffFunc
|
Backoff BackoffFunc
|
||||||
// Check if retriable func
|
// Check if retriable func
|
||||||
CheckIfRetriable IsRetriableFunc
|
Retry RetryFunc
|
||||||
// Transport Dial Timeout
|
// Transport Dial Timeout
|
||||||
DialTimeout time.Duration
|
DialTimeout time.Duration
|
||||||
// Number of Call attempts
|
// Number of Call attempts
|
||||||
@ -76,7 +76,7 @@ func newOptions(options ...Option) Options {
|
|||||||
Codecs: make(map[string]codec.NewCodec),
|
Codecs: make(map[string]codec.NewCodec),
|
||||||
CallOptions: CallOptions{
|
CallOptions: CallOptions{
|
||||||
Backoff: DefaultBackoff,
|
Backoff: DefaultBackoff,
|
||||||
CheckIfRetriable: DefaultCheckIfRetriable,
|
Retry: DefaultRetry,
|
||||||
Retries: DefaultRetries,
|
Retries: DefaultRetries,
|
||||||
RequestTimeout: DefaultRequestTimeout,
|
RequestTimeout: DefaultRequestTimeout,
|
||||||
DialTimeout: transport.DefaultDialTimeout,
|
DialTimeout: transport.DefaultDialTimeout,
|
||||||
@ -224,11 +224,11 @@ func WithBackoff(fn BackoffFunc) CallOption {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithCheckIfRetriable is a CallOption which overrides that which
|
// WithRetry is a CallOption which overrides that which
|
||||||
// set in Options.CallOptions
|
// set in Options.CallOptions
|
||||||
func WithCheckIfRetriable(fn IsRetriableFunc) CallOption {
|
func WithRetry(fn RetryFunc) CallOption {
|
||||||
return func(o *CallOptions) {
|
return func(o *CallOptions) {
|
||||||
o.CheckIfRetriable = fn
|
o.Retry = fn
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
8
client/retry.go
Normal file
8
client/retry.go
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
package client
|
||||||
|
|
||||||
|
type RetryFunc func(err error) bool
|
||||||
|
|
||||||
|
// always retry on error
|
||||||
|
func alwaysRetry(err error) bool {
|
||||||
|
return true
|
||||||
|
}
|
@ -300,7 +300,7 @@ func (r *rpcClient) Call(ctx context.Context, request Request, response interfac
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if !callOpts.CheckIfRetriable(err) {
|
if !callOpts.Retry(err) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user