From 40a22ecbb1f89fb0c8408f604f0ed9c250551b0a Mon Sep 17 00:00:00 2001
From: sirkrypt0 <22522058+sirkrypt0@users.noreply.github.com>
Date: Mon, 3 May 2021 14:58:47 +0200
Subject: [PATCH] Move http server start from main to runServer

---
 main.go | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/main.go b/main.go
index b0813ca..40f54d8 100644
--- a/main.go
+++ b/main.go
@@ -14,6 +14,28 @@ import (
 
 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() {
 	config.InitConfig()
 	logging.InitializeLogging(config.Config.Logger.Level)
@@ -26,27 +48,7 @@ func main() {
 		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
-			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")
-			}
-		}
-	}()
+	go runServer(server)
 
 	// wait for SIGINT
 	signals := make(chan os.Signal, 1)