Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-31 12:15:56 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddy: Start all servers only after all listeners successful (#2508)

Browse Source
This commit is contained in:
Aka.Why 2019-03-11 11:01:56 +08:00 committed by Matt Holt
parent 47b78714b8
commit 397d67876c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
caddy.go
View File

@ -781,6 +781,10 @@ func startServers(serverList []Server, inst *Instance, restartFds map[string]res
} }
} }
inst.servers = append(inst.servers, ServerListener{server: s, listener: ln, packet: pc})
}
for _, s := range inst.servers {
inst.wg.Add(2) inst.wg.Add(2)
stopWg.Add(2) stopWg.Add(2)
func(s Server, ln net.Listener, pc net.PacketConn, inst *Instance) { func(s Server, ln net.Listener, pc net.PacketConn, inst *Instance) {
@ -799,9 +803,7 @@ func startServers(serverList []Server, inst *Instance, restartFds map[string]res
}() }()
errChan <- s.ServePacket(pc) errChan <- s.ServePacket(pc)
}() }()
}(s, ln, pc, inst) }(s.server, s.listener, s.packet, inst)
inst.servers = append(inst.servers, ServerListener{server: s, listener: ln, packet: pc})
} }
// Log errors that may be returned from Serve() calls, // Log errors that may be returned from Serve() calls,