migrate on both binaries

This commit is contained in:
sentriz
2019-07-03 13:11:06 +01:00
parent c7c9ecbf04
commit dbe7f1fb62
3 changed files with 16 additions and 24 deletions

View File

@@ -36,9 +36,6 @@ func main() {
db, db,
*musicPath, *musicPath,
) )
if err := s.MigrateDB(); err != nil {
log.Fatalf("error migrating: %v\n", err)
}
if err := s.Start(); err != nil { if err := s.Start(); err != nil {
log.Fatalf("error starting scanner: %v\n", err) log.Fatalf("error starting scanner: %v\n", err)
} }

View File

@@ -8,6 +8,8 @@ import (
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sentriz/gonic/model"
) )
var ( var (
@@ -28,7 +30,20 @@ func New(path string) (*gorm.DB, error) {
if err != nil { if err != nil {
return nil, errors.Wrap(err, "with gorm") return nil, errors.Wrap(err, "with gorm")
} }
db.DB().SetMaxOpenConns(dbMaxOpenConns)
db.SetLogger(log.New(os.Stdout, "gorm ", 0)) db.SetLogger(log.New(os.Stdout, "gorm ", 0))
db.DB().SetMaxOpenConns(dbMaxOpenConns)
db.AutoMigrate(
model.Artist{},
model.Track{},
model.User{},
model.Setting{},
model.Play{},
model.Album{},
)
db.FirstOrCreate(&model.User{}, model.User{
Name: "admin",
Password: "admin",
IsAdmin: true,
})
return db, nil return db, nil
} }

View File

@@ -72,26 +72,6 @@ func New(db *gorm.DB, musicPath string) *Scanner {
} }
} }
func (s *Scanner) MigrateDB() error {
s.tx = s.db.Begin()
defer s.tx.Commit()
s.tx.AutoMigrate(
model.Artist{},
model.Track{},
model.User{},
model.Setting{},
model.Play{},
model.Album{},
)
s.tx.FirstOrCreate(&model.User{}, model.User{
Name: "admin",
Password: "admin",
IsAdmin: true,
})
log.Printf("finished migrate")
return nil
}
func (s *Scanner) Start() error { func (s *Scanner) Start() error {
if atomic.LoadInt32(&IsScanning) == 1 { if atomic.LoadInt32(&IsScanning) == 1 {
return errors.New("already scanning") return errors.New("already scanning")