Compare commits
3 Commits
v3.10.2
...
f17bcbf046
Author | SHA1 | Date | |
---|---|---|---|
f17bcbf046 | |||
|
8af0ad942d | ||
cd84ab56af |
2
go.mod
2
go.mod
@@ -5,7 +5,7 @@ go 1.22.0
|
||||
toolchain go1.23.4
|
||||
|
||||
require (
|
||||
go.unistack.org/micro/v3 v3.11.37
|
||||
go.unistack.org/micro/v3 v3.11.43
|
||||
golang.org/x/net v0.34.0
|
||||
)
|
||||
|
||||
|
4
go.sum
4
go.sum
@@ -21,8 +21,8 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR
|
||||
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
||||
go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
|
||||
go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
|
||||
go.unistack.org/micro/v3 v3.11.37 h1:ZcpnXAYEMcAwmnVb5b7o8/PylGnILxXMHaUlRrPmRI0=
|
||||
go.unistack.org/micro/v3 v3.11.37/go.mod h1:POGU5hstnAT9LH70m8FalyQSNi2GfIew71K75JenIZk=
|
||||
go.unistack.org/micro/v3 v3.11.43 h1:+zIt+NjMhHHNbOpllQVilz96UWV5qsSGV+JFgTC4xFM=
|
||||
go.unistack.org/micro/v3 v3.11.43/go.mod h1:POGU5hstnAT9LH70m8FalyQSNi2GfIew71K75JenIZk=
|
||||
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
|
||||
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
|
||||
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
|
||||
|
18
tcp.go
18
tcp.go
@@ -1,5 +1,5 @@
|
||||
// Package tcp implements a go-micro.Server
|
||||
package tcp // import "go.unistack.org/micro-server-tcp/v3"
|
||||
package tcp
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -16,7 +16,7 @@ import (
|
||||
"go.unistack.org/micro/v3/logger"
|
||||
"go.unistack.org/micro/v3/register"
|
||||
"go.unistack.org/micro/v3/server"
|
||||
|
||||
msync "go.unistack.org/micro/v3/sync"
|
||||
"golang.org/x/net/netutil"
|
||||
)
|
||||
|
||||
@@ -62,6 +62,9 @@ func (h *Server) Options() server.Options {
|
||||
}
|
||||
|
||||
func (h *Server) Init(opts ...server.Option) error {
|
||||
if h.opts.Wait == nil {
|
||||
h.opts.Wait = msync.NewWaitGroup()
|
||||
}
|
||||
if len(opts) == 0 && h.init {
|
||||
return nil
|
||||
}
|
||||
@@ -486,15 +489,14 @@ func (h *Server) serve(ln net.Listener, hd Handler) {
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
config.Logger.Error(config.Context, "tcp: accept err", err)
|
||||
return
|
||||
if h.opts.Wait != nil {
|
||||
h.opts.Wait.Add(1)
|
||||
}
|
||||
|
||||
h.opts.Wait.Add(1)
|
||||
go func() {
|
||||
hd.Serve(c)
|
||||
h.opts.Wait.Done()
|
||||
if h.opts.Wait != nil {
|
||||
h.opts.Wait.Done()
|
||||
}
|
||||
}()
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user