good morning!!!!

Skip to content
Snippets Groups Projects
Commit 15dc0a88 authored by Garet Halliday's avatar Garet Halliday
Browse files

fix

parent 671ee0d7
Branches
Tags
No related merge requests found
...@@ -92,18 +92,35 @@ func serve(client fed.Conn, acceptParams frontends.AcceptParams, pools Pools) er ...@@ -92,18 +92,35 @@ func serve(client fed.Conn, acceptParams frontends.AcceptParams, pools Pools) er
func Serve(acceptor Acceptor, pools Pools) error { func Serve(acceptor Acceptor, pools Pools) error {
for { for {
conn, acceptParams, err := acceptor.Accept() netConn, err := acceptor.Listener.Accept()
if err != nil { if err != nil {
if errors.Is(err, net.ErrClosed) { if errors.Is(err, net.ErrClosed) {
return nil return nil
} }
log.Print("error accepting client: ", err) log.Print("error accepting connection: ", err)
continue continue
} }
conn := fed.WrapNetConn(netConn)
go func() { go func() {
err := serve(conn, acceptParams, pools) defer func() {
_ = conn.Close()
}()
ctx := frontends.AcceptContext{
Conn: conn,
Options: acceptor.Options,
}
acceptParams, acceptErr := frontends.Accept(&ctx)
if acceptErr != nil {
log.Print("error accepting client: ", acceptErr)
return
}
err = serve(conn, acceptParams, pools)
if err != nil && !errors.Is(err, io.EOF) { if err != nil && !errors.Is(err, io.EOF) {
log.Print("error serving client: ", err) log.Print("error serving client: ", err)
return
} }
}() }()
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment