add stop ev

go.mod

@@ -3,6 +3,7 @@ module github.com/x-mod/tcpserver
 go 1.13
 
 require (
-	github.com/x-mod/routine v1.2.10 // indirect
+	github.com/x-mod/event v0.0.1
+	github.com/x-mod/routine v1.3.0 // indirect
 	golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
 )

go.sum

@@ -1,6 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
@@ -9,15 +10,25 @@ github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 h1:f0n1xnMSmBLzVf
 github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/x-mod/errors v0.1.6 h1:k0XsZCl/aQKPGo293ewOuYnRuxy9YVxDmUIC/b4C47s=
 github.com/x-mod/errors v0.1.6/go.mod h1:sWzfaUOjYKcW4cQaF/VEUQibdxGjkD+8LnL+GJhkIs0=
+github.com/x-mod/event v0.0.1 h1:PBgJ8eAfj+8uidQcJQAaRuXTbkFd9gg4BRsnHdHshdw=
+github.com/x-mod/event v0.0.1/go.mod h1:zyojdq5vj6hPRXVHvqb1ka7UZ4rP8W10gfsHIBDAu9s=
 github.com/x-mod/routine v1.2.10 h1:l9ruReSSHGox2WnrajWA4kNWJSi2VQ2bBqw1pAR2ths=
 github.com/x-mod/routine v1.2.10/go.mod h1:FUJxsh8BYaKeT88jyhr0ubhumCMusZla3VlrrL46dcs=
+github.com/x-mod/routine v1.3.0 h1:WvQZAYBk8ZuYQpxdU7+S6U5zPdbbKo8Q5PVPL5iY7Sk=
+github.com/x-mod/routine v1.3.0/go.mod h1:sahp55IQiyf6cJar5lCXcH9pwE1Cd/cuBwTbglCyX/I=
+github.com/x-mod/sigtrap v0.1.0 h1:tCFFx0ZluBtzkcWwJWxxaXK1oVek5O4LJfB9iTHITb4=
+github.com/x-mod/sigtrap v0.1.0/go.mod h1:cGdazs+3wsvER2vgbznHIyzXhefdjs2Q5lCR9ETBVA0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -29,4 +40,6 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM=
 google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

tcpserver.go

@@ -8,6 +8,7 @@ import (
 	"runtime"
 	"sync"
 
+	"github.com/x-mod/event"
 	"golang.org/x/net/trace"
 )
 
@@ -24,7 +25,8 @@ type Server struct {
 	mu       sync.Mutex
 	events   trace.EventLog
 	listener net.Listener
-	tlsc     *tls.Config
+	tls      *tls.Config
+	stop     *event.Event
 	wgroup   sync.WaitGroup
 }
 
@@ -54,9 +56,9 @@ func Address(addr string) ServerOpt {
 }
 
 //TLSConfig option
-func TLSConfig(sc *tls.Config) ServerOpt {
+func TLSConfig(tls *tls.Config) ServerOpt {
 	return func(srv *Server) {
-		srv.tlsc = sc
+		srv.tls = tls
 	}
 }
 
@@ -132,13 +134,16 @@ func (srv *Server) Serve(ctx context.Context) error {
 		srv.printf("%s serving at %s:%s", srv.name, srv.network, srv.address)
 		srv.listener = ln
 	}
-	if srv.tlsc != nil {
-		srv.listener = tls.NewListener(srv.listener, srv.tlsc)
+	if srv.tls != nil {
+		srv.listener = tls.NewListener(srv.listener, srv.tls)
 	}
+	srv.stop = event.New()
 	for {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
+		case <-srv.stop.Done():
+			return nil
 		default:
 			con, err := srv.listener.Accept()
 			if err != nil {
@@ -170,10 +175,10 @@ func (srv *Server) Serve(ctx context.Context) error {
 
 //Close tcpserver waiting all connections finished
 func (srv *Server) Close() {
-	_ = srv.listener.Close()
+	if srv.stop != nil {
+		srv.stop.Fire()
+	}
 	srv.wgroup.Wait()
-	srv.mu.Lock()
-	defer srv.mu.Unlock()
 	if srv.events != nil {
 		srv.events.Finish()
 		srv.events = nil