fix linting (#4)

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2020-11-03 01:08:23 +03:00
committed by GitHub
parent e6ab6d50eb
commit 40b0870cf8
36 changed files with 218 additions and 188 deletions

View File

@@ -8,6 +8,7 @@ import (
"github.com/unistack-org/micro/v3/router"
)
// Option func
type Option func(*Options)
// Options configure network

View File

@@ -1,31 +1,35 @@
package transport
type NoopTransport struct {
type noopTransport struct {
opts Options
}
func (t *NoopTransport) Init(opts ...Option) error {
func NewTransport(opts ...Option) Transport {
return &noopTransport{opts: NewOptions(opts...)}
}
func (t *noopTransport) Init(opts ...Option) error {
for _, o := range opts {
o(&t.opts)
}
return nil
}
func (t *NoopTransport) Options() Options {
func (t *noopTransport) Options() Options {
return t.opts
}
func (t *NoopTransport) Dial(addr string, opts ...DialOption) (Client, error) {
func (t *noopTransport) Dial(addr string, opts ...DialOption) (Client, error) {
options := NewDialOptions(opts...)
return &noopClient{opts: options}, nil
}
func (t *NoopTransport) Listen(addr string, opts ...ListenOption) (Listener, error) {
func (t *noopTransport) Listen(addr string, opts ...ListenOption) (Listener, error) {
options := NewListenOptions(opts...)
return &noopListener{opts: options}, nil
}
func (t *NoopTransport) String() string {
func (t *noopTransport) String() string {
return "noop"
}

View File

@@ -6,7 +6,8 @@ import (
)
var (
DefaultTransport Transport = &NoopTransport{opts: NewOptions()}
// DefaultTransport is the global default transport
DefaultTransport Transport = NewTransport()
)
// Transport is an interface which is used for communication between

View File

@@ -15,6 +15,7 @@ var (
DefaultToken = "go.micro.tunnel"
)
// Option func
type Option func(*Options)
// Options provides network configuration options
@@ -33,8 +34,10 @@ type Options struct {
Logger logger.Logger
}
// DialOption func
type DialOption func(*DialOptions)
// DialOptions provides dial options
type DialOptions struct {
// Link specifies the link to use
Link string
@@ -46,8 +49,10 @@ type DialOptions struct {
Timeout time.Duration
}
// ListenOption func
type ListenOption func(*ListenOptions)
// ListenOptions provides listen options
type ListenOptions struct {
// specify mode of the session
Mode Mode
@@ -55,7 +60,7 @@ type ListenOptions struct {
Timeout time.Duration
}
// The tunnel id
// Id sets the tunnel id
func Id(id string) Option {
return func(o *Options) {
o.Id = id
@@ -69,7 +74,7 @@ func Logger(l logger.Logger) Option {
}
}
// The tunnel address
// Address sets the tunnel address
func Address(a string) Option {
return func(o *Options) {
o.Address = a
@@ -97,23 +102,21 @@ func Transport(t transport.Transport) Option {
}
}
// Listen options
// ListenMode option
func ListenMode(m Mode) ListenOption {
return func(o *ListenOptions) {
o.Mode = m
}
}
// Timeout for reads and writes on the listener session
// ListenTimeout for reads and writes on the listener session
func ListenTimeout(t time.Duration) ListenOption {
return func(o *ListenOptions) {
o.Timeout = t
}
}
// Dial options
// Dial multicast sets the multicast option to send only to those mapped
// DialMode multicast sets the multicast option to send only to those mapped
func DialMode(m Mode) DialOption {
return func(o *DialOptions) {
o.Mode = m
@@ -144,10 +147,14 @@ func DialWait(b bool) DialOption {
}
// DefaultOptions returns router default options
func DefaultOptions() Options {
return Options{
func NewOptions(opts ...Option) Options {
options := Options{
Id: uuid.New().String(),
Address: DefaultAddress,
Token: DefaultToken,
}
for _, o := range opts {
o(&options)
}
return options
}

View File

@@ -93,7 +93,7 @@ func NewTransport(opts ...transport.Option) transport.Transport {
return t
}
// WithTransport sets the internal tunnel
// WithTunnel sets the internal tunnel
func WithTunnel(t tunnel.Tunnel) transport.Option {
return func(o *transport.Options) {
if o.Context == nil {