From 6dfdff7fd8b2b097b290ffeaf1aa636fe70373e9 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Mon, 26 Apr 2021 23:13:23 +0300 Subject: [PATCH] fieldaligment Signed-off-by: Vasiliy Tolstov --- api/resolver/subdomain/subdomain.go | 2 +- meter/handler/handler.go | 2 +- network/transport/memory.go | 6 +++--- network/tunnel/broker/broker.go | 4 ++-- network/tunnel/transport/transport.go | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/api/resolver/subdomain/subdomain.go b/api/resolver/subdomain/subdomain.go index f224f26a..06cfd45f 100644 --- a/api/resolver/subdomain/subdomain.go +++ b/api/resolver/subdomain/subdomain.go @@ -19,8 +19,8 @@ func NewResolver(parent resolver.Resolver, opts ...resolver.Option) resolver.Res } type subdomainResolver struct { - opts resolver.Options resolver.Resolver + opts resolver.Options } // Resolve resolve endpoint based on subdomain diff --git a/meter/handler/handler.go b/meter/handler/handler.go index 19f40bd9..8f21ce59 100644 --- a/meter/handler/handler.go +++ b/meter/handler/handler.go @@ -22,8 +22,8 @@ type Option func(*Options) type Options struct { Meter meter.Meter - MeterOptions []meter.Option Name string + MeterOptions []meter.Option } func Meter(m meter.Meter) Option { diff --git a/network/transport/memory.go b/network/transport/memory.go index 544076bb..1aad85c6 100644 --- a/network/transport/memory.go +++ b/network/transport/memory.go @@ -31,18 +31,18 @@ type memoryClient struct { } type memoryListener struct { - topts Options - ctx context.Context lopts ListenOptions + ctx context.Context exit chan bool conn chan *memorySocket addr string + topts Options sync.RWMutex } type memoryTransport struct { - opts Options listeners map[string]*memoryListener + opts Options sync.RWMutex } diff --git a/network/tunnel/broker/broker.go b/network/tunnel/broker/broker.go index ef047c7e..11b52db8 100644 --- a/network/tunnel/broker/broker.go +++ b/network/tunnel/broker/broker.go @@ -12,16 +12,16 @@ import ( ) type tunBroker struct { - opts broker.Options tunnel tunnel.Tunnel + opts broker.Options } type tunSubscriber struct { - opts broker.SubscribeOptions listener tunnel.Listener handler broker.Handler closed chan bool topic string + opts broker.SubscribeOptions } type tunEvent struct { diff --git a/network/tunnel/transport/transport.go b/network/tunnel/transport/transport.go index d817471d..10b38b4c 100644 --- a/network/tunnel/transport/transport.go +++ b/network/tunnel/transport/transport.go @@ -10,9 +10,8 @@ import ( ) type tunTransport struct { + tunnel tunnel.Tunnel options transport.Options - - tunnel tunnel.Tunnel } type tunnelKey struct{}