From 81b0110b68dfb74cf084245c879d728e526ab03a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 13 Nov 2019 20:30:02 +0100 Subject: [PATCH] use log package --- database/database.go | 5 ++++- routes/healthz/healthz_endpoint.go | 4 ++-- start.go | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/database/database.go b/database/database.go index 72f55de..c62bfdf 100644 --- a/database/database.go +++ b/database/database.go @@ -1,8 +1,9 @@ package database import ( - "flag" "fmt" + "log" + "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm/dialects/postgres" "log" @@ -54,6 +55,8 @@ func InitDB(dbname string, isTest bool) *gorm.DB { DropTables(db) } + log.Println("Database connection established") + return db } diff --git a/routes/healthz/healthz_endpoint.go b/routes/healthz/healthz_endpoint.go index 7883830..e1e26e6 100644 --- a/routes/healthz/healthz_endpoint.go +++ b/routes/healthz/healthz_endpoint.go @@ -1,10 +1,10 @@ package healthz import ( - "fmt" "git.rwth-aachen.de/acs/public/villas/web-backend-go/amqp" "git.rwth-aachen.de/acs/public/villas/web-backend-go/database" "github.com/gin-gonic/gin" + "log" "net/http" ) @@ -35,7 +35,7 @@ func getHealth(c *gin.Context) { if len(database.AMQP_URL) != 0 { err = amqp.CheckConnection() if err != nil { - fmt.Println(err.Error()) + log.Println(err.Error()) c.JSON(http.StatusInternalServerError, gin.H{ "success:": false, "message": err.Error(), diff --git a/start.go b/start.go index df9caf2..e3009e1 100644 --- a/start.go +++ b/start.go @@ -1,7 +1,7 @@ package main import ( - "fmt" + "log" "git.rwth-aachen.de/acs/public/villas/web-backend-go/amqp" "git.rwth-aachen.de/acs/public/villas/web-backend-go/routes/healthz" "time" @@ -71,7 +71,7 @@ func main() { fmt.Println("Starting AMQP client") err := amqp.ConnectAMQP(database.AMQP_URL) if err != nil { - panic(err) + log.Panic(err) } // Periodically call the Ping function to check which simulators are still there @@ -83,12 +83,14 @@ func main() { case <-ticker.C: err = amqp.PingAMQP() if err != nil { - fmt.Println("AMQP Error: ", err.Error()) + log.Println("AMQP Error: ", err.Error()) } } } }() + + log.Printf("Connected AMQP client to %s", amqpurl) } // server at port 4000 to match frontend's redirect path r.Run(":4000")