From 1cbd1d2bad83d2a0f7db4c34d6666f5a6d076c59 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sun, 20 Sep 2020 16:57:54 +0300 Subject: [PATCH] fix Signed-off-by: Vasiliy Tolstov --- client/options.go | 2 +- network/options.go | 2 +- {tunnel => network/tunnel}/broker/broker.go | 4 ++-- {tunnel => network/tunnel}/options.go | 2 +- .../tunnel}/transport/listener.go | 4 ++-- .../tunnel}/transport/transport.go | 4 ++-- {tunnel => network/tunnel}/tunnel.go | 2 +- options.go | 2 +- server/handler.go | 18 +++++++++++++----- server/options.go | 2 +- util/client/client_test.go | 2 +- util/io/io.go | 2 +- util/pool/default.go | 2 +- util/pool/default_test.go | 4 ++-- util/pool/options.go | 2 +- util/pool/pool.go | 2 +- util/socket/socket.go | 2 +- 17 files changed, 33 insertions(+), 25 deletions(-) rename {tunnel => network/tunnel}/broker/broker.go (97%) rename {tunnel => network/tunnel}/options.go (98%) rename {tunnel => network/tunnel}/transport/listener.go (79%) rename {tunnel => network/tunnel}/transport/transport.go (95%) rename {tunnel => network/tunnel}/tunnel.go (98%) diff --git a/client/options.go b/client/options.go index 9a1243d7..b14aae18 100644 --- a/client/options.go +++ b/client/options.go @@ -11,7 +11,7 @@ import ( "github.com/unistack-org/micro/v3/router" "github.com/unistack-org/micro/v3/selector" "github.com/unistack-org/micro/v3/selector/random" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) type Options struct { diff --git a/network/options.go b/network/options.go index 2ab05100..1dd262e3 100644 --- a/network/options.go +++ b/network/options.go @@ -5,7 +5,7 @@ import ( "github.com/unistack-org/micro/v3/logger" "github.com/unistack-org/micro/v3/proxy" "github.com/unistack-org/micro/v3/router" - "github.com/unistack-org/micro/v3/tunnel" + "github.com/unistack-org/micro/v3/network/tunnel" ) type Option func(*Options) diff --git a/tunnel/broker/broker.go b/network/tunnel/broker/broker.go similarity index 97% rename from tunnel/broker/broker.go rename to network/tunnel/broker/broker.go index 5790d0eb..404ba2c5 100644 --- a/tunnel/broker/broker.go +++ b/network/tunnel/broker/broker.go @@ -7,8 +7,8 @@ import ( "github.com/unistack-org/micro/v3/broker" "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/transport" - "github.com/unistack-org/micro/v3/tunnel" + "github.com/unistack-org/micro/v3/network/transport" + "github.com/unistack-org/micro/v3/network/tunnel" ) type tunBroker struct { diff --git a/tunnel/options.go b/network/tunnel/options.go similarity index 98% rename from tunnel/options.go rename to network/tunnel/options.go index ded756a0..9f29d9fe 100644 --- a/tunnel/options.go +++ b/network/tunnel/options.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" "github.com/unistack-org/micro/v3/logger" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) var ( diff --git a/tunnel/transport/listener.go b/network/tunnel/transport/listener.go similarity index 79% rename from tunnel/transport/listener.go rename to network/tunnel/transport/listener.go index 2ef48244..ebab4ef9 100644 --- a/tunnel/transport/listener.go +++ b/network/tunnel/transport/listener.go @@ -1,8 +1,8 @@ package transport import ( - "github.com/unistack-org/micro/v3/transport" - "github.com/unistack-org/micro/v3/tunnel" + "github.com/unistack-org/micro/v3/network/transport" + "github.com/unistack-org/micro/v3/network/tunnel" ) type tunListener struct { diff --git a/tunnel/transport/transport.go b/network/tunnel/transport/transport.go similarity index 95% rename from tunnel/transport/transport.go rename to network/tunnel/transport/transport.go index ae54be7d..018c2a5b 100644 --- a/tunnel/transport/transport.go +++ b/network/tunnel/transport/transport.go @@ -5,8 +5,8 @@ import ( "context" "fmt" - "github.com/unistack-org/micro/v3/transport" - "github.com/unistack-org/micro/v3/tunnel" + "github.com/unistack-org/micro/v3/network/transport" + "github.com/unistack-org/micro/v3/network/tunnel" ) type tunTransport struct { diff --git a/tunnel/tunnel.go b/network/tunnel/tunnel.go similarity index 98% rename from tunnel/tunnel.go rename to network/tunnel/tunnel.go index 2c18d2dd..1c342c34 100644 --- a/tunnel/tunnel.go +++ b/network/tunnel/tunnel.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) var ( diff --git a/options.go b/options.go index 73bb6fa7..a1c0ba80 100644 --- a/options.go +++ b/options.go @@ -19,7 +19,7 @@ import ( "github.com/unistack-org/micro/v3/server" "github.com/unistack-org/micro/v3/store" "github.com/unistack-org/micro/v3/tracer" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) // Options for micro service diff --git a/server/handler.go b/server/handler.go index 30787d0b..7c7821ff 100644 --- a/server/handler.go +++ b/server/handler.go @@ -10,8 +10,16 @@ type HandlerOptions struct { Context context.Context } -func NewHandlerOptions() HandlerOptions { - return HandlerOptions{Context: context.Background()} +func NewHandlerOptions(opts ...HandlerOption) HandlerOptions { + options := HandlerOptions{ + Context: context.Background(), + } + + for _, o := range opts { + o(&options) + } + + return options } type SubscriberOption func(*SubscriberOptions) @@ -26,16 +34,16 @@ type SubscriberOptions struct { } func NewSubscriberOptions(opts ...SubscriberOption) SubscriberOptions { - opt := SubscriberOptions{ + options := SubscriberOptions{ AutoAck: true, Context: context.Background(), } for _, o := range opts { - o(&opt) + o(&options) } - return opt + return options } // EndpointMetadata is a Handler option that allows metadata to be added to diff --git a/server/options.go b/server/options.go index 83fc3ed9..203f2ae5 100644 --- a/server/options.go +++ b/server/options.go @@ -12,7 +12,7 @@ import ( "github.com/unistack-org/micro/v3/logger" "github.com/unistack-org/micro/v3/registry" "github.com/unistack-org/micro/v3/tracer" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) type Options struct { diff --git a/util/client/client_test.go b/util/client/client_test.go index b685f8be..299147a8 100644 --- a/util/client/client_test.go +++ b/util/client/client_test.go @@ -15,7 +15,7 @@ import ( rtreg "github.com/unistack-org/micro/v3/router/registry" "github.com/unistack-org/micro/v3/server" grpcsrv "github.com/unistack-org/micro/v3/server/grpc" - tmemory "github.com/unistack-org/micro/v3/transport/memory" + tmemory "github.com/unistack-org/micro/v3/network/transport/memory" cw "github.com/unistack-org/micro/v3/util/client" ) diff --git a/util/io/io.go b/util/io/io.go index 7a892b49..430105e3 100644 --- a/util/io/io.go +++ b/util/io/io.go @@ -4,7 +4,7 @@ package io import ( "io" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) type rwc struct { diff --git a/util/pool/default.go b/util/pool/default.go index b22da3dd..9baf3e25 100644 --- a/util/pool/default.go +++ b/util/pool/default.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) type pool struct { diff --git a/util/pool/default_test.go b/util/pool/default_test.go index 7b9913b9..8a6ea172 100644 --- a/util/pool/default_test.go +++ b/util/pool/default_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/unistack-org/micro/v3/transport" - "github.com/unistack-org/micro/v3/transport/memory" + "github.com/unistack-org/micro/v3/network/transport" + "github.com/unistack-org/micro/v3/network/transport/memory" ) func testPool(t *testing.T, size int, ttl time.Duration) { diff --git a/util/pool/options.go b/util/pool/options.go index 54a653cb..f7fab0b5 100644 --- a/util/pool/options.go +++ b/util/pool/options.go @@ -3,7 +3,7 @@ package pool import ( "time" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) type Options struct { diff --git a/util/pool/pool.go b/util/pool/pool.go index 22e914d0..56ae5c6b 100644 --- a/util/pool/pool.go +++ b/util/pool/pool.go @@ -4,7 +4,7 @@ package pool import ( "time" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) // Pool is an interface for connection pooling diff --git a/util/socket/socket.go b/util/socket/socket.go index 5a5cf72a..eea08be1 100644 --- a/util/socket/socket.go +++ b/util/socket/socket.go @@ -4,7 +4,7 @@ package socket import ( "io" - "github.com/unistack-org/micro/v3/transport" + "github.com/unistack-org/micro/v3/network/transport" ) // Socket is our pseudo socket for transport.Socket