From 00989a7725b7c9bf1459d9bfcac6f1b7a2b5e2af Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Fri, 5 Feb 2021 19:31:35 +0100
Subject: [PATCH] get rid of ConfigureBackend

---
 configuration/config.go | 27 ---------------------------
 routes/register.go      |  2 ++
 start.go                | 40 +++++++++++++++++++++++++++-------------
 3 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/configuration/config.go b/configuration/config.go
index e53c5cb..ac8bd6e 100644
--- a/configuration/config.go
+++ b/configuration/config.go
@@ -160,30 +160,3 @@ func InitConfig() error {
 
 	return nil
 }
-
-func ConfigureBackend() (string, string, string, string, string, error) {
-
-	err := InitConfig()
-	if err != nil {
-		log.Printf("Error during initialization of global configuration: %v, aborting.", err.Error())
-		return "", "", "", "", "", err
-	}
-
-	mode, err := GlobalConfig.String("mode")
-	if err != nil {
-		log.Printf("Error reading mode from global configuration: %v, aborting.", err.Error())
-		return "", "", "", "", "", err
-	}
-
-	port, err := GlobalConfig.String("port")
-	if err != nil {
-		log.Printf("Error reading port from global configuration: %v, aborting.", err.Error())
-		return "", "", "", "", "", err
-	}
-
-	AMQPhost, _ := GlobalConfig.String("amqp.host")
-	AMQPuser, _ := GlobalConfig.String("amqp.user")
-	AMQPpass, _ := GlobalConfig.String("amqp.pass")
-
-	return mode, port, AMQPhost, AMQPuser, AMQPpass, nil
-}
diff --git a/routes/register.go b/routes/register.go
index 6bc7026..9c5105b 100644
--- a/routes/register.go
+++ b/routes/register.go
@@ -145,6 +145,8 @@ func AddTestData(cfg *config.Config, router *gin.Engine) (*bytes.Buffer, error)
 		return nil, err
 	}
 
+	basePath := "/api/v2"
+
 	// add users
 	for _, u := range GlobalTestData.Users {
 		code, resp, err := helper.TestEndpoint(router, token, basePath+"/users", "POST", helper.KeyModels{"user": u})
diff --git a/start.go b/start.go
index e746c49..feda381 100644
--- a/start.go
+++ b/start.go
@@ -82,43 +82,57 @@ func addData(router *gin.Engine, cfg *config.Config) error {
 func main() {
 	log.Println("Starting VILLASweb-backend-go")
 
-	mode, port, amqphost, amqpuser, amqppass, err := configuration.ConfigureBackend()
+	err := configuration.InitConfig()
 	if err != nil {
-		panic(err)
+		log.Fatalf("Error during initialization of global configuration: %s, aborting.", err)
 	}
 
-	//init database
+	mode, err := configuration.GlobalConfig.String("mode")
+	if err != nil {
+		log.Fatalf("Error reading mode from global configuration: %s, aborting.", err)
+	}
+
+	port, err := configuration.GlobalConfig.String("port")
+	if err != nil {
+		log.Fatalf("Error reading port from global configuration: %s, aborting.", err)
+	}
+
+	// Init database
 	err = database.InitDB(configuration.GlobalConfig)
 	if err != nil {
-		log.Printf("Error during initialization of database: %v, aborting.", err.Error())
-		panic(err)
+		log.Fatalf("Error during initialization of database: %s, aborting.", err)
 	}
 	defer database.DBpool.Close()
 
-	// init endpoints
+	// Init endpoints
 	if mode == "release" {
 		gin.SetMode(gin.ReleaseMode)
 	}
+
 	r := gin.Default()
 	api := r.Group("/api/v2")
 	routes.RegisterEndpoints(r, api)
 
-	//Start AMQP client
-	if amqphost != "" {
+	// Start AMQP client
+	AMQPhost, _ := configuration.GlobalConfig.String("amqp.host")
+	AMQPuser, _ := configuration.GlobalConfig.String("amqp.user")
+	AMQPpass, _ := configuration.GlobalConfig.String("amqp.pass")
+
+	if AMQPhost != "" {
 		// create amqp URL based on username, password and host
-		amqpurl := "amqp://" + amqpuser + ":" + amqppass + "@" + amqphost
+		amqpurl := "amqp://" + AMQPuser + ":" + AMQPpass + "@" + AMQPhost
 		err = infrastructure_component.StartAMQP(amqpurl, api)
 		if err != nil {
-			panic(err)
+			log.Fatal(err)
 		}
 	}
 
-	// add data to DB (if any)
+	// Add data to DB (if any)
 	err = addData(r, configuration.GlobalConfig)
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 
-	// server at port 4000 to match frontend's redirect path
+	// Server at port 4000 to match frontend's redirect path
 	r.Run(":" + port)
 }