trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

internal: fix listen attempt on shutdown

Browse source 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2022-01-03 12:36:11 +01:00
parent 924f6f104a
commit c741c13132
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmd/server/main.go
View file

@ -73,17 +73,14 @@ func main() {
} }
} }
go web.RunMetricsServer() go web.RunMetricsServer()
for { go attemptStartBackend(g)
go attemptStartBackend(g) ws.Start()
ws.Start() <-ex
running = false
<-ex l.Info("shutting down gunicorn")
running = false go g.Kill()
l.Info("shutting down gunicorn") l.Info("shutting down webserver")
go g.Kill() go ws.Shutdown()
l.Info("shutting down webserver")
go ws.Shutdown()
}
} }
func attemptStartBackend(g *gounicorn.GoUnicorn) { func attemptStartBackend(g *gounicorn.GoUnicorn) {

2
internal/outpost/proxyv2/proxyv2.go
View file

@ -134,7 +134,7 @@ func (ps *ProxyServer) ServeHTTPS() {
ln, err := net.Listen("tcp", listenAddress) ln, err := net.Listen("tcp", listenAddress)
if err != nil { if err != nil {
ps.log.WithError(err).Warning("Failed to listen for HTTPS") ps.log.WithError(err).Warning("Failed to listen (TLS)")
} }
proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}} proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}}
defer proxyListener.Close() defer proxyListener.Close()

2
internal/web/tls.go
View file

@ -40,7 +40,7 @@ func (ws *WebServer) listenTLS() {
ln, err := net.Listen("tcp", config.G.Web.ListenTLS) ln, err := net.Listen("tcp", config.G.Web.ListenTLS)
if err != nil { if err != nil {
ws.log.WithError(err).Fatalf("failed to listen") ws.log.WithError(err).Fatalf("failed to listen (TLS)")
return return
} }
proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}} proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}}