Move DB Init to main module

cmd/db640bot/main.go

@@ -8,6 +8,7 @@ import (
 
 	"git.1750studios.com/ToddShepard/DB640/internal/bot"
 	"git.1750studios.com/ToddShepard/DB640/internal/config"
+	"git.1750studios.com/ToddShepard/DB640/internal/database"
 	"git.1750studios.com/ToddShepard/DB640/internal/web"
 )
 
@@ -19,6 +20,7 @@ func main() {
 	}
 
 	config.LoadConfig(*cfg)
+	database.Init()
 	bot.Init()
 	web.Init()
 

internal/bot/bot.go

@@ -19,12 +19,6 @@ var updates telegram.UpdateChan
 func Init() {
 	var err error
 
-	err = database.Open(config.C.Database.Dialect, config.C.Database.Connection)
-	if err != nil {
-		log.Fatalf("Could not establish database connection: %+v", err)
-	}
-	log.Printf("[DATABASE] Connection established\n")
-
 	twitter.Init()
 	stream, err = twitter.GetStreamForTag(config.C.Twitter.MagicHashtag)
 	if err != nil {

internal/database/database.go

@@ -1,8 +1,10 @@
 package database
 
 import (
+	"log"
 	"time"
 
+	"git.1750studios.com/ToddShepard/DB640/internal/config"
 	"github.com/jinzhu/gorm"
 
 	// SQLite dialect for gorm
@@ -48,6 +50,15 @@ type TGChat struct {
 // Db is the GORM database handle
 var Db *gorm.DB
 
+// Init initzialises the database
+func Init() {
+	err := Open(config.C.Database.Dialect, config.C.Database.Connection)
+	if err != nil {
+		log.Fatalf("Could not establish database connection: %+v", err)
+	}
+	log.Printf("[DATABASE] Connection established\n")
+}
+
 // Open opens the database connection with given dialect and connection string
 func Open(dialect string, connection string) (err error) {
 	Db, err = gorm.Open(dialect, connection)