1
0
mirror of https://github.com/kataras/iris.git synced 2026-01-07 20:17:05 +00:00

Option for Socket Sharding as requested at #1544

Former-commit-id: 0384baf593012377a94344d647ca41121294285a
This commit is contained in:
Gerasimos (Makis) Maropoulos
2020-06-26 20:29:36 +03:00
parent 836e641229
commit 7f9e664b90
23 changed files with 234 additions and 171 deletions

View File

@@ -13,9 +13,9 @@ import (
"sync/atomic"
"time"
"golang.org/x/crypto/acme/autocert"
"github.com/kataras/iris/v12/core/netutil"
"golang.org/x/crypto/acme/autocert"
)
// Configurator provides an easy way to modify
@@ -48,6 +48,9 @@ type Supervisor struct {
// Defaults to empty.
IgnoredErrors []string
onErr []func(error)
// See `iris.Configuration.SocketSharding`.
SocketSharding bool
}
// New returns a new host supervisor
@@ -124,8 +127,8 @@ func (su *Supervisor) newListener() (net.Listener, error) {
// restarts we may want for the server.
//
// User still be able to call .Serve instead.
// l, err := netutil.TCPKeepAlive(su.Server.Addr)
l, err := netutil.TCP(su.Server.Addr)
// l, err := netutil.TCPKeepAlive(su.Server.Addr, su.SocketReuse)
l, err := netutil.TCP(su.Server.Addr, su.SocketSharding)
if err != nil {
return nil, err
}
@@ -367,7 +370,13 @@ func (su *Supervisor) runTLS(getCertificate func(*tls.ClientHelloInfo) (*tls.Cer
defer cancel()
http1RedirectServer.Shutdown(ctx)
})
go http1RedirectServer.ListenAndServe()
ln, err := netutil.TCP(":http", su.SocketSharding)
if err != nil {
return err
}
go http1RedirectServer.Serve(ln)
}
if su.Server.TLSConfig == nil {
@@ -401,7 +410,12 @@ func (su *Supervisor) runTLS(getCertificate func(*tls.ClientHelloInfo) (*tls.Cer
}
}
return su.supervise(func() error { return su.Server.ListenAndServeTLS("", "") })
ln, err := netutil.TCP(su.Server.Addr, su.SocketSharding)
if err != nil {
return err
}
return su.supervise(func() error { return su.Server.ServeTLS(ln, "", "") })
}
// RegisterOnShutdown registers a function to call on Shutdown.