From da31b862a2bcc66385853a7d03798813188c7cff Mon Sep 17 00:00:00 2001 From: Arsen Musayelyan Date: Thu, 4 May 2023 11:53:01 -0700 Subject: [PATCH] Move database load into main() --- db.go | 10 +++++----- main.go | 7 ++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/db.go b/db.go index c3ab12e..4022524 100644 --- a/db.go +++ b/db.go @@ -20,17 +20,17 @@ package main import ( "github.com/jmoiron/sqlx" - "go.elara.ws/logger/log" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" ) var gdb *sqlx.DB -func init() { - var err error - gdb, err = db.Open(config.DBPath) +func loadDB() error { + ldb, err := db.Open(config.DBPath) if err != nil { - log.Fatal("Error opening database").Err(err).Send() + return err } + gdb = ldb + return nil } diff --git a/main.go b/main.go index 68b1cc5..6243928 100644 --- a/main.go +++ b/main.go @@ -62,6 +62,11 @@ func main() { log.Fatal("Running LURE as root is forbidden as it may cause catastrophic damage to your system").Send() } + err := LoadDB() + if err != nil { + log.Fatal("Error loading database").Err(err).Send() + } + ctx := context.Background() ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM) defer cancel() @@ -231,7 +236,7 @@ func main() { EnableBashCompletion: true, } - err := app.RunContext(ctx, os.Args) + err = app.RunContext(ctx, os.Args) if err != nil { log.Error("Error while running app").Err(err).Send() }