kris/Go-Back-Skeleton
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use log.Fatal instead panic on config errors

Browse source
This commit is contained in:
dhax 2017-10-19 00:40:25 +02:00
parent 2dc0f02d1c
commit fce1b99683
7 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

28
database/migrate/main.go
View file

@ -1,8 +1,7 @@
package migrate
import (
"fmt"
"os"
"log"
"github.com/dhax/go-base/database"
"github.com/go-pg/migrations"
@ -13,7 +12,7 @@ import (
func Migrate(args []string) {
db, err := database.DBConn()
if err != nil {
panic(err)
log.Fatal(err)
}
err = db.RunInTransaction(func(tx *pg.Tx) error {
@ -22,14 +21,14 @@ func Migrate(args []string) {
return err
}
if newVersion != oldVersion {
fmt.Printf("migrated from version %d to %d\n", oldVersion, newVersion)
log.Printf("migrated from version %d to %d\n", oldVersion, newVersion)
} else {
fmt.Printf("version is %d\n", oldVersion)
log.Printf("version is %d\n", oldVersion)
}
return nil
})
if err != nil {
exitf(err.Error())
log.Fatal(err)
}
}
@ -38,12 +37,12 @@ func Migrate(args []string) {
func Reset() {
db, err := database.DBConn()
if err != nil {
exitf(err.Error())
log.Fatal(err)
}
version, err := migrations.Version(db)
if err != nil {
exitf(err.Error())
log.Fatal(err)
}
err = db.RunInTransaction(func(tx *pg.Tx) error {
@ -52,21 +51,12 @@ func Reset() {
if err != nil {
return err
}
fmt.Printf("migrated from version %d to %d\n", oldVersion, newVersion)
log.Printf("migrated from version %d to %d\n", oldVersion, newVersion)
version = newVersion
}
return nil
})
if err != nil {
exitf(err.Error())
log.Fatal(err)
}
}
func errorf(s string, args ...interface{}) {
fmt.Fprintf(os.Stderr, s+"\n", args...)
}
func exitf(s string, args ...interface{}) {
errorf(s, args...)
os.Exit(1)
}

4
database/postgres.go
View file

@ -1,7 +1,7 @@
package database
import (
"fmt"
"log"
"time"
"github.com/spf13/viper"
@ -28,7 +28,7 @@ func DBConn() (*pg.DB, error) {
if err != nil {
panic(err)
}
fmt.Printf("%s %s\n", time.Since(event.StartTime), query)
log.Printf("%s %s\n", time.Since(event.StartTime), query)
})
}