From ee11f39a2f21b3653862e030f3cb3fd3a39a7874 Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Tue, 27 Apr 2021 00:03:05 +0300
Subject: [PATCH] fieldaligment

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 client/options.go         | 18 +++++++++---------
 logger/micro.go           |  2 +-
 logger/wrapper/wrapper.go | 16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/client/options.go b/client/options.go
index 8dccd296..27c0295e 100644
--- a/client/options.go
+++ b/client/options.go
@@ -19,8 +19,8 @@ import (
 
 // Options holds client options
 type Options struct {
-	// CallOptions contains default CallOptions
-	CallOptions CallOptions
+	// Selector used to select needed address
+	Selector selector.Selector
 	// Logger used to log messages
 	Logger logger.Logger
 	// Tracer used for tracing
@@ -31,30 +31,30 @@ type Options struct {
 	Meter meter.Meter
 	// Router used to get route
 	Router router.Router
-	// Selector used to select needed address
-	Selector selector.Selector
 	// Transport used for transfer messages
 	Transport transport.Transport
 	// Context is used for external options
 	Context context.Context
-	// Codecs map
-	Codecs map[string]codec.Codec
 	// Lookup func used to get destination addr
 	Lookup LookupFunc
+	// Codecs map
+	Codecs map[string]codec.Codec
+	// TLSConfig specifies tls.Config for secure connection
+	TLSConfig *tls.Config
 	// Proxy is used for proxy requests
 	Proxy string
-	// ContentType is Used to select codec
+	// ContentType is used to select codec
 	ContentType string
 	// Name is the client name
 	Name string
 	// Wrappers contains wrappers
 	Wrappers []Wrapper
+	// CallOptions contains default CallOptions
+	CallOptions CallOptions
 	// PoolSize connection pool size
 	PoolSize int
 	// PoolTTL connection pool ttl
 	PoolTTL time.Duration
-	// TLSConfig specifies tls.Config for secure connection
-	TLSConfig *tls.Config
 }
 
 // NewCallOptions creates new call options struct
diff --git a/logger/micro.go b/logger/micro.go
index 7e9d8ae5..9ec61039 100644
--- a/logger/micro.go
+++ b/logger/micro.go
@@ -21,8 +21,8 @@ func init() {
 }
 
 type defaultLogger struct {
-	opts Options
 	enc  *json.Encoder
+	opts Options
 	sync.RWMutex
 }
 
diff --git a/logger/wrapper/wrapper.go b/logger/wrapper/wrapper.go
index 6e818012..e19411ed 100644
--- a/logger/wrapper/wrapper.go
+++ b/logger/wrapper/wrapper.go
@@ -81,10 +81,10 @@ type ServerSubscriberObserver func(context.Context, server.Message, error) []str
 type Options struct {
 	// Logger that used for log
 	Logger logger.Logger
-	// Level for logger
-	Level logger.Level
-	// Enabled flag
-	Enabled bool
+	// ServerHandlerObservers funcs
+	ServerHandlerObservers []ServerHandlerObserver
+	// ServerSubscriberObservers funcs
+	ServerSubscriberObservers []ServerSubscriberObserver
 	// ClientCallObservers funcs
 	ClientCallObservers []ClientCallObserver
 	// ClientStreamObservers funcs
@@ -93,12 +93,12 @@ type Options struct {
 	ClientPublishObservers []ClientPublishObserver
 	// ClientCallFuncObservers funcs
 	ClientCallFuncObservers []ClientCallFuncObserver
-	// ServerHandlerObservers funcs
-	ServerHandlerObservers []ServerHandlerObserver
-	// ServerSubscriberObservers funcs
-	ServerSubscriberObservers []ServerSubscriberObserver
 	// SkipEndpoints
 	SkipEndpoints []string
+	// Level for logger
+	Level logger.Level
+	// Enabled flag
+	Enabled bool
 }
 
 // Option func signature