htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Panic Recovery

Browse Source 
by moving the recovery functionality in the main goroutine.
This commit is contained in:
Maximilian Paß
2023-03-21 21:23:24 +00:00
committed by Sebastian Serth
parent d9bc114d36
commit 0d829c9308
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/poseidon/main.go
View File

@ -110,7 +110,10 @@ func initProfiling(options config.Profiling) (cancel func()) {
return cancel return cancel
} }
func runServer(server *http.Server) { func runServer(server *http.Server, cancel context.CancelFunc) {
defer cancel()
defer shutdownSentry() // shutdownSentry must be executed in the main goroutine.
log.WithField("address", server.Addr).Info("Starting server") log.WithField("address", server.Addr).Info("Starting server")
var err error var err error
if config.Config.Server.TLS.Active { if config.Config.Server.TLS.Active {
@ -193,17 +196,21 @@ func initServer() *http.Server {
// shutdownOnOSSignal listens for a signal from the operating system // shutdownOnOSSignal listens for a signal from the operating system
// When receiving a signal the server shuts down but waits up to 15 seconds to close remaining connections. // When receiving a signal the server shuts down but waits up to 15 seconds to close remaining connections.
func shutdownOnOSSignal(server *http.Server) { func shutdownOnOSSignal(server *http.Server, ctx context.Context) {
// wait for SIGINT // wait for SIGINT
signals := make(chan os.Signal, 1) signals := make(chan os.Signal, 1)
signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM) signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
<-signals select {
log.Info("Received SIGINT, shutting down ...") case <-ctx.Done():
os.Exit(1)
case <-signals:
log.Info("Received SIGINT, shutting down ...")
ctx, cancel := context.WithTimeout(context.Background(), gracefulShutdownWait) ctx, cancel := context.WithTimeout(context.Background(), gracefulShutdownWait)
defer cancel() defer cancel()
if err := server.Shutdown(ctx); err != nil { if err := server.Shutdown(ctx); err != nil {
log.WithError(err).Warn("error shutting server down") log.WithError(err).Warn("error shutting server down")
}
} }
} }
@ -213,15 +220,15 @@ func main() {
} }
logging.InitializeLogging(config.Config.Logger.Level) logging.InitializeLogging(config.Config.Logger.Level)
initSentry(&config.Config.Sentry, config.Config.Profiling.Enabled) initSentry(&config.Config.Sentry, config.Config.Profiling.Enabled)
defer shutdownSentry()
cancel := monitoring.InitializeInfluxDB(&config.Config.InfluxDB) cancelInflux := monitoring.InitializeInfluxDB(&config.Config.InfluxDB)
defer cancel() defer cancelInflux()
stopProfiling := initProfiling(config.Config.Profiling) stopProfiling := initProfiling(config.Config.Profiling)
defer stopProfiling() defer stopProfiling()
ctx, cancel := context.WithCancel(context.Background())
server := initServer() server := initServer()
go runServer(server) go runServer(server, cancel)
shutdownOnOSSignal(server) shutdownOnOSSignal(server, ctx)
} }