5376b9e271
* New config files
As decided, config files are parsed at runtime.
I decided to go for YAML config files because there can be comments in
it.
There are 2 files:
* config/default_config.yml <= which shouldn't be edited unless we add a
config parameter
* config/config.yml <= which is the user-defined config. This file
shouldn't be commited
Changed every call to config.XXX to config.Conf.XXX (look to the new
stucture of config in config/types.go)
Of course, putting config parameters in config.yml overrides config in
config_default.yml. You don't have to put everything in it, just add
what you want to override.
* Fixing test
Replacing conf.New by config.Conf
* Fixing call to config.Conf to config.Config{} in test files
* Might have fixed testing with this
Printf instead of Fatalf
* Renaming config.yml in example file
* Forbid commiting config.yml
* Should be now fixed
* Do not need this file anymore
90 lignes
1,9 Kio
Go
90 lignes
1,9 Kio
Go
package db
|
|
|
|
import (
|
|
"github.com/NyaaPantsu/nyaa/config"
|
|
"github.com/NyaaPantsu/nyaa/model"
|
|
"github.com/NyaaPantsu/nyaa/util/log"
|
|
"github.com/azhao12345/gorm"
|
|
_ "github.com/jinzhu/gorm/dialects/postgres" // Need for postgres support
|
|
_ "github.com/jinzhu/gorm/dialects/sqlite" // Need for sqlite
|
|
)
|
|
|
|
const (
|
|
SqliteType = "sqlite3"
|
|
)
|
|
|
|
// Logger interface
|
|
type Logger interface {
|
|
Print(v ...interface{})
|
|
}
|
|
|
|
// DefaultLogger : use the default gorm logger that prints to stdout
|
|
var DefaultLogger Logger
|
|
|
|
// ORM : Variable for interacting with database
|
|
var ORM *gorm.DB
|
|
|
|
// IsSqlite : Variable to know if we are in sqlite or postgres
|
|
var IsSqlite bool
|
|
|
|
// GormInit init gorm ORM.
|
|
func GormInit(conf *config.Config, logger Logger) (*gorm.DB, error) {
|
|
|
|
db, openErr := gorm.Open(conf.DBType, conf.DBParams)
|
|
if openErr != nil {
|
|
log.CheckError(openErr)
|
|
return nil, openErr
|
|
}
|
|
|
|
IsSqlite = conf.DBType == SqliteType
|
|
|
|
connectionErr := db.DB().Ping()
|
|
if connectionErr != nil {
|
|
log.CheckError(connectionErr)
|
|
return nil, connectionErr
|
|
}
|
|
|
|
// Negative MaxIdleConns means don't retain any idle connection
|
|
maxIdleConns := -1
|
|
if IsSqlite {
|
|
// sqlite doesn't like having a negative maxIdleConns
|
|
maxIdleConns = 10
|
|
}
|
|
|
|
db.DB().SetMaxIdleConns(maxIdleConns)
|
|
db.DB().SetMaxOpenConns(400)
|
|
|
|
if config.Conf.Environment == "DEVELOPMENT" {
|
|
db.LogMode(true)
|
|
}
|
|
|
|
switch conf.DBLogMode {
|
|
case "detailed":
|
|
db.LogMode(true)
|
|
case "silent":
|
|
db.LogMode(false)
|
|
}
|
|
|
|
if logger != nil {
|
|
db.SetLogger(logger)
|
|
}
|
|
|
|
db.AutoMigrate(&model.User{}, &model.UserFollows{}, &model.UserUploadsOld{}, &model.Notification{})
|
|
if db.Error != nil {
|
|
return db, db.Error
|
|
}
|
|
db.AutoMigrate(&model.Torrent{}, &model.TorrentReport{})
|
|
if db.Error != nil {
|
|
return db, db.Error
|
|
}
|
|
db.AutoMigrate(&model.File{})
|
|
if db.Error != nil {
|
|
return db, db.Error
|
|
}
|
|
db.AutoMigrate(&model.Comment{}, &model.OldComment{})
|
|
if db.Error != nil {
|
|
return db, db.Error
|
|
}
|
|
|
|
return db, nil
|
|
}
|