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

Move http server start from main to runServer

Browse Source
This commit is contained in:
sirkrypt0
2021-05-03 14:58:47 +02:00
committed by Jan-Eric Hellenberg
parent 50b3836d25
commit 40a22ecbb1
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
main.go
View File

@ -14,6 +14,28 @@ import (
var log = logging.GetLogger("main") var log = logging.GetLogger("main")
func runServer(server *http.Server) {
log.WithField("address", server.Addr).Info("Starting server")
var err error
if config.Config.Server.TLS {
server.TLSConfig = config.TLSConfig
log.
WithField("CertFile", config.Config.Server.CertFile).
WithField("KeyFile", config.Config.Server.KeyFile).
Debug("Using TLS")
err = server.ListenAndServeTLS(config.Config.Server.CertFile, config.Config.Server.KeyFile)
} else {
err = server.ListenAndServe()
}
if err != nil {
if err == http.ErrServerClosed {
log.WithError(err).Info("Server closed")
} else {
log.WithError(err).Fatal("Error during listening and serving")
}
}
}
func main() { func main() {
config.InitConfig() config.InitConfig()
logging.InitializeLogging(config.Config.Logger.Level) logging.InitializeLogging(config.Config.Logger.Level)
@ -26,27 +48,7 @@ func main() {
Handler: api.NewRouter(), Handler: api.NewRouter(),
} }
log.WithField("address", server.Addr).Info("Starting server") go runServer(server)
go func() {
var err error
if config.Config.Server.TLS {
server.TLSConfig = config.TLSConfig
log.
WithField("CertFile", config.Config.Server.CertFile).
WithField("KeyFile", config.Config.Server.KeyFile).
Debug("Using TLS")
err = server.ListenAndServeTLS(config.Config.Server.CertFile, config.Config.Server.KeyFile)
} else {
err = server.ListenAndServe()
}
if err != nil {
if err == http.ErrServerClosed {
log.WithError(err).Info("Server closed")
} else {
log.WithError(err).Fatal("Error during listening and serving")
}
}
}()
// wait for SIGINT // wait for SIGINT
signals := make(chan os.Signal, 1) signals := make(chan os.Signal, 1)