Bump golang.org/x/net from 0.0.0-20220225172249-27dd8689420f to 0.7.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220225172249-27dd8689420f to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/commits/v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 00:14:12 +00:00
5 changed files with 94 additions and 141 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +0,0 @@
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-bin
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
-# Go workspace file
-go.work
-
-# General
-.DS_Store
-.idea
-.vscode
--- a/go.mod
+++ b/go.mod
@@ -1,15 +1,8 @@
 module go.unistack.org/micro-server-tcp/v3

-go 1.20
+go 1.16

 require (
-	go.unistack.org/micro/v3 v3.10.51
-	golang.org/x/net v0.22.0
-)
-
-require (
-	github.com/golang/protobuf v1.5.3 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
-	google.golang.org/grpc v1.57.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	go.unistack.org/micro/v3 v3.10.14
+	golang.org/x/net v0.7.0
 )
--- a/go.sum
+++ b/go.sum
@@ -1,20 +1,36 @@
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-go.unistack.org/micro/v3 v3.10.51 h1:7JlgbJDXA4+9zyk5EJ5KqvRCeMA4htu0OofntiN+hFE=
-go.unistack.org/micro/v3 v3.10.51/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e h1:NumxXLPfHSndr3wBBdeKiVHjGVFzi9RX2HwwQke94iY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
-google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
-google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.unistack.org/micro/v3 v3.10.14 h1:7fgLpwGlCN67twhwtngJDEQvrMkUBDSA5vzZqxIDqNE=
+go.unistack.org/micro/v3 v3.10.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/subscriber.go
+++ b/subscriber.go
@@ -1,6 +1,7 @@
 package tcp

 import (
+	"bytes"
 	"context"
 	"fmt"
 	"reflect"
@@ -9,8 +10,8 @@ import (
 	"unicode/utf8"

 	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/server"
 )
@@ -183,11 +184,11 @@ func validateSubscriber(sub server.Subscriber) error {
 	return nil
 }

-func (h *Server) createSubHandler(sb *tcpSubscriber, opts server.Options) broker.Handler {
+func (s *tcpServer) createSubHandler(sb *tcpSubscriber, opts server.Options) broker.Handler {
 	return func(p broker.Event) error {
 		msg := p.Message()
 		ct := msg.Header["Content-Type"]
-		cf, err := h.newCodec(ct)
+		cf, err := s.newCodec(ct)
 		if err != nil {
 			return err
 		}
@@ -219,6 +220,16 @@ func (h *Server) createSubHandler(sb *tcpSubscriber, opts server.Options) broker
 				req = req.Elem()
 			}

+			buf := bytes.NewBuffer(msg.Body)
+
+			if err := cf.ReadHeader(buf, &codec.Message{}, codec.Event); err != nil {
+				return err
+			}
+
+			if err := cf.ReadBody(buf, req.Interface()); err != nil {
+				return err
+			}
+
 			fn := func(ctx context.Context, msg server.Message) error {
 				var vals []reflect.Value
 				if sb.typ.Kind() != reflect.Func {
@@ -237,11 +248,9 @@ func (h *Server) createSubHandler(sb *tcpSubscriber, opts server.Options) broker
 				return nil
 			}

-			opts.Hooks.EachNext(func(hook options.Hook) {
-				if h, ok := hook.(server.HookSubHandler); ok {
-					fn = h(fn)
-				}
-			})
+			for i := len(opts.SubWrappers); i > 0; i-- {
+				fn = opts.SubWrappers[i-1](fn)
+			}

 			go func() {
 				results <- fn(ctx, &tcpMessage{
--- a/tcp.go
+++ b/tcp.go
@@ -2,13 +2,11 @@
 package tcp // import "go.unistack.org/micro-server-tcp/v3"

 import (
-	"context"
 	"crypto/tls"
 	"fmt"
 	"net"
 	"sort"
 	"sync"
-	"sync/atomic"
 	"time"

 	"go.unistack.org/micro/v3/broker"
@@ -16,52 +14,34 @@ import (
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/server"
-
 	"golang.org/x/net/netutil"
 )

-var _ server.Server = (*Server)(nil)
-
-type Server struct {
+type tcpServer struct {
 	hd          server.Handler
 	rsvc        *register.Service
 	exit        chan chan error
 	subscribers map[*tcpSubscriber][]broker.Subscriber
 	opts        server.Options
 	sync.RWMutex
-	registered  bool
-	init        bool
-	stateLive   *atomic.Uint32
-	stateReady  *atomic.Uint32
-	stateHealth *atomic.Uint32
+	registered bool
+	init       bool
 }

-func (h *Server) Live() bool {
-	return h.stateLive.Load() == 1
-}
-
-func (h *Server) Ready() bool {
-	return h.stateReady.Load() == 1
-}
-
-func (h *Server) Health() bool {
-	return h.stateHealth.Load() == 1
-}
-
-func (h *Server) newCodec(ct string) (codec.Codec, error) {
+func (h *tcpServer) newCodec(ct string) (codec.Codec, error) {
 	if cf, ok := h.opts.Codecs[ct]; ok {
 		return cf, nil
 	}
 	return nil, codec.ErrUnknownContentType
 }

-func (h *Server) Options() server.Options {
+func (h *tcpServer) Options() server.Options {
 	h.RLock()
 	defer h.RUnlock()
 	return h.opts
 }

-func (h *Server) Init(opts ...server.Option) error {
+func (h *tcpServer) Init(opts ...server.Option) error {
 	if len(opts) == 0 && h.init {
 		return nil
 	}
@@ -86,18 +66,21 @@ func (h *Server) Init(opts ...server.Option) error {
 	if err := h.opts.Meter.Init(); err != nil {
 		return err
 	}
+	if err := h.opts.Transport.Init(); err != nil {
+		return err
+	}

 	return nil
 }

-func (h *Server) Handle(handler server.Handler) error {
+func (h *tcpServer) Handle(handler server.Handler) error {
 	h.Lock()
 	h.hd = handler
 	h.Unlock()
 	return nil
 }

-func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
+func (h *tcpServer) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
 	options := server.NewHandlerOptions(opts...)

 	eps := make([]*register.Endpoint, 0, len(options.Metadata))
@@ -121,11 +104,11 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 	return th
 }

-func (h *Server) NewSubscriber(topic string, handler interface{}, opts ...server.SubscriberOption) server.Subscriber {
+func (h *tcpServer) NewSubscriber(topic string, handler interface{}, opts ...server.SubscriberOption) server.Subscriber {
 	return newSubscriber(topic, handler, opts...)
 }

-func (h *Server) Subscribe(sb server.Subscriber) error {
+func (h *tcpServer) Subscribe(sb server.Subscriber) error {
 	sub, ok := sb.(*tcpSubscriber)
 	if !ok {
 		return fmt.Errorf("invalid subscriber: expected *tcpSubscriber")
@@ -148,7 +131,7 @@ func (h *Server) Subscribe(sb server.Subscriber) error {
 	return nil
 }

-func (h *Server) Register() error {
+func (h *tcpServer) Register() error {
 	h.Lock()
 	config := h.opts
 	rsvc := h.rsvc
@@ -193,7 +176,7 @@ func (h *Server) Register() error {

 	if !registered {
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Info(config.Context, fmt.Sprintf("Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID))
+			config.Logger.Infof(config.Context, "Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID)
 		}
 	}

@@ -229,7 +212,7 @@ func (h *Server) Register() error {
 		opts = append(opts, broker.SubscribeAutoAck(sb.Options().AutoAck))

 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Info(config.Context, "Subscribing to topic: "+sb.Topic())
+			config.Logger.Infof(config.Context, "Subscribing to topic: %s", sb.Topic())
 		}

 		sub, err := config.Broker.Subscribe(subCtx, sb.Topic(), handler, opts...)
@@ -245,7 +228,7 @@ func (h *Server) Register() error {
 	return nil
 }

-func (h *Server) Deregister() error {
+func (h *tcpServer) Deregister() error {
 	h.Lock()
 	config := h.opts
 	h.Unlock()
@@ -256,7 +239,7 @@ func (h *Server) Deregister() error {
 	}

 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Info(config.Context, "Deregistering node: "+service.Nodes[0].ID)
+		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].ID)
 	}

 	if err := server.DefaultDeregisterFunc(service, config); err != nil {
@@ -283,11 +266,11 @@ func (h *Server) Deregister() error {
 			go func(s broker.Subscriber) {
 				defer wg.Done()
 				if config.Logger.V(logger.InfoLevel) {
-					config.Logger.Info(config.Context, "Unsubscribing from topic: "+s.Topic())
+					config.Logger.Infof(config.Context, "Unsubscribing from topic: %s", s.Topic())
 				}
 				if err := s.Unsubscribe(subCtx); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(config.Context, "Unsubscribing from errot topic: "+s.Topic(), err)
+						config.Logger.Errorf(config.Context, "Unsubscribing from topic: %s err: %v", s.Topic(), err)
 					}
 				}
 			}(sub)
@@ -300,7 +283,7 @@ func (h *Server) Deregister() error {
 	return nil
 }

-func (h *Server) getListener() net.Listener {
+func (h *tcpServer) getListener() net.Listener {
 	if h.opts.Context == nil {
 		return nil
 	}
@@ -313,7 +296,7 @@ func (h *Server) getListener() net.Listener {
 	return l
 }

-func (h *Server) Start() error {
+func (h *tcpServer) Start() error {
 	h.RLock()
 	config := h.opts
 	hd := h.hd.Handler()
@@ -347,7 +330,7 @@ func (h *Server) Start() error {
 	}

 	if config.Logger.V(logger.ErrorLevel) {
-		config.Logger.Info(config.Context, "Listening on "+ts.Addr().String())
+		config.Logger.Infof(config.Context, "Listening on %s", ts.Addr().String())
 	}

 	h.Lock()
@@ -368,9 +351,6 @@ func (h *Server) Start() error {
 		return fmt.Errorf("invalid handler %T", hd)
 	}
 	go h.serve(ts, handle)
-	h.stateLive.Store(1)
-	h.stateReady.Store(1)
-	h.stateHealth.Store(1)

 	go func() {
 		t := new(time.Ticker)
@@ -396,23 +376,23 @@ func (h *Server) Start() error {
 				// nolint: nestif
 				if rerr != nil && registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s deregister, check error", config.Name, config.ID), rerr)
+						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s, deregister it", config.Name, config.ID, rerr)
 					}
 					// deregister self in case of error
 					if err := h.Deregister(); err != nil {
 						if config.Logger.V(logger.ErrorLevel) {
-							config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s deregister error", config.Name, config.ID), err)
+							config.Logger.Errorf(config.Context, "Server %s-%s deregister error: %s", config.Name, config.ID, err)
 						}
 					}
 				} else if rerr != nil && !registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s register check error", config.Name, config.ID), rerr)
+						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, rerr)
 					}
 					continue
 				}
 				if err := h.Register(); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s register error", config.Name, config.ID), err)
+						config.Logger.Errorf(config.Context, "Server %s-%s register error: %s", config.Name, config.ID, err)
 					}
 				}
 				// wait for exit
@@ -421,49 +401,36 @@ func (h *Server) Start() error {
 			}
 		}

-		h.gracefulStop()
-
 		ch <- ts.Close()

-		h.stateLive.Store(0)
-		h.stateReady.Store(0)
-		h.stateHealth.Store(0)
-
 		// deregister
 		if cerr := h.Deregister(); cerr != nil {
-			config.Logger.Error(config.Context, "Register deregister error", cerr)
+			config.Logger.Errorf(config.Context, "Register deregister error: %v", cerr)
 		}

 		if cerr := config.Broker.Disconnect(config.Context); cerr != nil {
-			config.Logger.Error(config.Context, "Broker disconnect error", cerr)
+			config.Logger.Errorf(config.Context, "Broker disconnect error: %v", cerr)
 		}
 	}()

 	return nil
 }

-func (h *Server) Stop() error {
+func (h *tcpServer) Stop() error {
 	ch := make(chan error)
 	h.exit <- ch
 	return <-ch
 }

-func (h *Server) gracefulStop() {
-	ctx, cancel := context.WithTimeout(context.Background(), h.opts.GracefulTimeout)
-	defer cancel()
-
-	h.opts.Wait.WaitContext(ctx)
-}
-
-func (h *Server) String() string {
+func (h *tcpServer) String() string {
 	return "tcp"
 }

-func (h *Server) Name() string {
+func (h *tcpServer) Name() string {
 	return h.opts.Name
 }

-func (h *Server) serve(ln net.Listener, hd Handler) {
+func (h *tcpServer) serve(ln net.Listener, hd Handler) {
 	var tempDelay time.Duration // how long to sleep on accept failure
 	h.RLock()
 	config := h.opts
@@ -487,35 +454,27 @@ func (h *Server) serve(ln net.Listener, hd Handler) {
 					tempDelay = max
 				}
 				if config.Logger.V(logger.ErrorLevel) {
-					config.Logger.Error(config.Context, fmt.Sprintf("tcp: Accept error: %v; retrying in %v", err, tempDelay))
+					config.Logger.Errorf(config.Context, "tcp: Accept error: %v; retrying in %v", err, tempDelay)
 				}
 				time.Sleep(tempDelay)
 				continue
 			}
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Error(config.Context, "tcp: Accept error", err)
+				config.Logger.Errorf(config.Context, "tcp: Accept error: %v", err)
 			}
 			return
 		}

 		if err != nil {
-			config.Logger.Error(config.Context, "tcp: accept err", err)
+			config.Logger.Errorf(config.Context, "tcp: accept err: %v", err)
 			return
 		}
-
-		h.opts.Wait.Add(1)
-		go func() {
-			hd.Serve(c)
-			h.opts.Wait.Done()
-		}()
+		go hd.Serve(c)
 	}
 }

 func NewServer(opts ...server.Option) server.Server {
-	return &Server{
-		stateLive:   &atomic.Uint32{},
-		stateReady:  &atomic.Uint32{},
-		stateHealth: &atomic.Uint32{},
+	return &tcpServer{
 		opts:        server.NewOptions(opts...),
 		exit:        make(chan chan error),
 		subscribers: make(map[*tcpSubscriber][]broker.Subscriber),