zenermerps/DB640
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move DB Init to main module

Browse source
This commit is contained in:
Andreas Mieke 2020-04-11 04:56:21 +02:00
parent 4ba2ededf9
commit a7b4e31bec
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/db640bot/main.go
View file

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

6
internal/bot/bot.go
View file

@ -19,12 +19,6 @@ var updates telegram.UpdateChan
func Init() { func Init() {
var err error 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() twitter.Init()
stream, err = twitter.GetStreamForTag(config.C.Twitter.MagicHashtag) stream, err = twitter.GetStreamForTag(config.C.Twitter.MagicHashtag)
if err != nil { if err != nil {

11
internal/database/database.go
View file

@ -1,8 +1,10 @@
package database package database
import ( import (
"log"
"time" "time"
"git.1750studios.com/ToddShepard/DB640/internal/config"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
// SQLite dialect for gorm // SQLite dialect for gorm
@ -48,6 +50,15 @@ type TGChat struct {
// Db is the GORM database handle // Db is the GORM database handle
var Db *gorm.DB 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 // Open opens the database connection with given dialect and connection string
func Open(dialect string, connection string) (err error) { func Open(dialect string, connection string) (err error) {
Db, err = gorm.Open(dialect, connection) Db, err = gorm.Open(dialect, connection)