diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-06-10 19:11:53 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-06-10 19:11:53 -0400 |
| commit | a3e1383cac3dfa2a71b04b47a295e9836fcb0d50 (patch) | |
| tree | 402818d9b343a921f5c372972fa237a91e40d0f5 /models/models.go | |
| parent | f160b4f33ca69df13b071648aad09e561dafec26 (diff) | |
| download | gitea-a3e1383cac3dfa2a71b04b47a295e9836fcb0d50.tar.gz gitea-a3e1383cac3dfa2a71b04b47a295e9836fcb0d50.zip | |
Add gogs fix location command
Diffstat (limited to 'models/models.go')
| -rw-r--r-- | models/models.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/models/models.go b/models/models.go index dca77e00e1..a59c051712 100644 --- a/models/models.go +++ b/models/models.go @@ -46,7 +46,9 @@ func LoadModelsConfig() { DbCfg.Host = setting.Cfg.MustValue("database", "HOST") DbCfg.Name = setting.Cfg.MustValue("database", "NAME") DbCfg.User = setting.Cfg.MustValue("database", "USER") - DbCfg.Pwd = setting.Cfg.MustValue("database", "PASSWD") + if len(DbCfg.Pwd) == 0 { + DbCfg.Pwd = setting.Cfg.MustValue("database", "PASSWD") + } DbCfg.SslMode = setting.Cfg.MustValue("database", "SSL_MODE") DbCfg.Path = setting.Cfg.MustValue("database", "PATH", "data/gogs.db") } @@ -67,7 +69,6 @@ func NewTestEngine(x *xorm.Engine) (err error) { } cnnstr := fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", DbCfg.User, DbCfg.Pwd, host, port, DbCfg.Name, DbCfg.SslMode) - //fmt.Println(cnnstr) x, err = xorm.NewEngine("postgres", cnnstr) case "sqlite3": if !EnableSQLite3 { |