Move http server start from main to runServer

main.go

@@ -14,20 +14,8 @@ import (
 
 var log = logging.GetLogger("main")
 
-func main() {
+func runServer(server *http.Server) {
-	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(),
-	}
-
 	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)