cmd/server: improve cleanup on shutdown

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer
2021-11-06 13:54:59 +01:00
parent 011babbbd9
commit 74382c6287
4 changed files with 23 additions and 16 deletions

View File

@ -74,14 +74,13 @@ func (ws *WebServer) listenPlain() {
if err != nil {
ws.log.WithError(err).Fatalf("failed to listen")
}
ws.log.WithField("addr", config.G.Web.Listen).Info("Running")
ws.log.WithField("addr", config.G.Web.Listen).Info("Listening")
proxyListener := &proxyproto.Listener{Listener: ln}
defer proxyListener.Close()
ws.serve(proxyListener)
ws.log.WithField("addr", config.G.Web.Listen).Info("Running")
err = http.ListenAndServe(config.G.Web.Listen, ws.m)
if err != nil && !errors.Is(err, http.ErrServerClosed) {
ws.log.Errorf("ERROR: http.Serve() - %s", err)