mirror of
https://github.com/foomo/contentserver.git
synced 2025-10-16 12:25:44 +00:00
fix: close conn
This commit is contained in:
parent
ff7d3da5d1
commit
368dcf4f3f
@ -8,7 +8,6 @@ import (
|
|||||||
"github.com/foomo/contentserver/client"
|
"github.com/foomo/contentserver/client"
|
||||||
"github.com/foomo/contentserver/pkg/handler"
|
"github.com/foomo/contentserver/pkg/handler"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"go.uber.org/zap/zaptest"
|
"go.uber.org/zap/zaptest"
|
||||||
@ -36,9 +35,13 @@ func initSocketRepoServer(tb testing.TB, l *zap.Logger) net.Listener {
|
|||||||
|
|
||||||
// listen on socket
|
// listen on socket
|
||||||
ln, err := nettest.NewLocalListener("tcp")
|
ln, err := nettest.NewLocalListener("tcp")
|
||||||
|
|
||||||
require.NoError(tb, err)
|
require.NoError(tb, err)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
<-tb.Context().Done()
|
||||||
|
_ = ln.Close()
|
||||||
|
}()
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
for {
|
for {
|
||||||
// this blocks until connection or error
|
// this blocks until connection or error
|
||||||
@ -54,7 +57,6 @@ func initSocketRepoServer(tb testing.TB, l *zap.Logger) net.Listener {
|
|||||||
go func() {
|
go func() {
|
||||||
l.Debug("accepted connection", zap.String("source", conn.RemoteAddr().String()))
|
l.Debug("accepted connection", zap.String("source", conn.RemoteAddr().String()))
|
||||||
h.Serve(conn)
|
h.Serve(conn)
|
||||||
assert.NoError(tb, conn.Close())
|
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user