Move http server start from main to runServer
This commit is contained in:

committed by
Jan-Eric Hellenberg

parent
50b3836d25
commit
40a22ecbb1
30
main.go
30
main.go
@ -14,20 +14,8 @@ import (
|
||||
|
||||
var log = logging.GetLogger("main")
|
||||
|
||||
func main() {
|
||||
config.InitConfig()
|
||||
logging.InitializeLogging(config.Config.Logger.Level)
|
||||
|
||||
server := &http.Server{
|
||||
Addr: fmt.Sprintf("%s:%d", config.Config.Server.Address, config.Config.Server.Port),
|
||||
WriteTimeout: time.Second * 15,
|
||||
ReadTimeout: time.Second * 15,
|
||||
IdleTimeout: time.Second * 60,
|
||||
Handler: api.NewRouter(),
|
||||
}
|
||||
|
||||
func runServer(server *http.Server) {
|
||||
log.WithField("address", server.Addr).Info("Starting server")
|
||||
go func() {
|
||||
var err error
|
||||
if config.Config.Server.TLS {
|
||||
server.TLSConfig = config.TLSConfig
|
||||
@ -46,7 +34,21 @@ func main() {
|
||||
log.WithError(err).Fatal("Error during listening and serving")
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func main() {
|
||||
config.InitConfig()
|
||||
logging.InitializeLogging(config.Config.Logger.Level)
|
||||
|
||||
server := &http.Server{
|
||||
Addr: fmt.Sprintf("%s:%d", config.Config.Server.Address, config.Config.Server.Port),
|
||||
WriteTimeout: time.Second * 15,
|
||||
ReadTimeout: time.Second * 15,
|
||||
IdleTimeout: time.Second * 60,
|
||||
Handler: api.NewRouter(),
|
||||
}
|
||||
|
||||
go runServer(server)
|
||||
|
||||
// wait for SIGINT
|
||||
signals := make(chan os.Signal, 1)
|
||||
|
Reference in New Issue
Block a user