baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Do not stop to listen on tcp listeners on temporary errors

Browse source
This commit is contained in:
Antoine 2019-12-04 16:26:05 +01:00 committed by Traefiker Bot
parent ef38810425
commit 0e6dce7093
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/server/server_entrypoint_tcp.go
View file

@ -135,6 +135,10 @@ func (e *TCPEntryPoint) startTCP(ctx context.Context) {
conn, err := e.listener.Accept() conn, err := e.listener.Accept()
if err != nil { if err != nil {
logger.Error(err) logger.Error(err)
if netErr, ok := err.(net.Error); ok && netErr.Temporary() {
continue
}
return return
} }

3
pkg/tls/certificate.go
View file

@ -80,7 +80,8 @@ func (f FileOrContent) IsPath() bool {
func (f FileOrContent) Read() ([]byte, error) { func (f FileOrContent) Read() ([]byte, error) {
var content []byte var content []byte
if _, err := os.Stat(f.String()); err == nil { if f.IsPath() {
var err error
content, err = ioutil.ReadFile(f.String()) content, err = ioutil.ReadFile(f.String())
if err != nil { if err != nil {
return nil, err return nil, err