From 86e0129ee0d0f6e10669ff3f17567ac073eecdd7 Mon Sep 17 00:00:00 2001 From: Louis Royer Date: Wed, 17 Jul 2024 19:17:44 +0200 Subject: [PATCH] update main --- internal/tasks/db.go | 8 +++++--- main.go | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/tasks/db.go b/internal/tasks/db.go index 6af110a..76235aa 100644 --- a/internal/tasks/db.go +++ b/internal/tasks/db.go @@ -7,12 +7,13 @@ package tasks import ( "database/sql" "fmt" - _ "github.com/lib/pq" - app_api "github.com/nextmn/srv6/internal/app/api" - "github.com/nextmn/srv6/internal/database" "log" "os" "time" + + _ "github.com/lib/pq" + app_api "github.com/nextmn/srv6/internal/app/api" + "github.com/nextmn/srv6/internal/database" ) // DBTask initializes the database @@ -94,6 +95,7 @@ func (db *DBTask) RunInit() error { maxAttempts := 16 ok = false for errcnt := 0; errcnt < maxAttempts; errcnt++ { + //FIXME: use select and time.After if err := postgres.Ping(); err != nil { // Exponential backoff time.Sleep(100 * (1 << errcnt) * time.Millisecond) diff --git a/main.go b/main.go index 1c7df7f..912e26e 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,6 @@ package main import ( - "fmt" "log" "os" "os/signal" @@ -55,7 +54,7 @@ func main() { Action: func(c *cli.Context) error { conf, err := srv6_config.ParseConf(config_file) if err != nil { - fmt.Println("Error loading config, exiting…:", err) + log.Println("Error loading config, exiting…:", err) os.Exit(1) } @@ -65,7 +64,7 @@ func main() { }(ch, setup) setup.AddTasks() if err := setup.Run(); err != nil { - fmt.Println("Error while running, exiting…:", err) + log.Println("Error while running, exiting…:", err) setup.Exit() os.Exit(2) }