diff options
| author | Unknwon <u@gogs.io> | 2015-03-14 22:21:55 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-03-14 22:21:55 -0400 |
| commit | 86abd34eb8b3bbc238ad695135f99f1a54b74da9 (patch) | |
| tree | 104b5068280b12c76ac4406af50e6352abe11cc6 /models | |
| parent | 7dbb98b2a3af2280c69d8d0f7abce13ec3610ece (diff) | |
| parent | fd07de575185dd6d683c3e2ad11063965c1345b5 (diff) | |
Merge branch 'develop' of github.com:gogits/gogs into develop
Diffstat (limited to 'models')
| -rw-r--r-- | models/models.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/models/models.go b/models/models.go index a9436fca..b7986fed 100644 --- a/models/models.go +++ b/models/models.go @@ -89,8 +89,13 @@ func getEngine() (*xorm.Engine, error) { cnnstr := "" switch DbCfg.Type { case "mysql": - cnnstr = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8", - DbCfg.User, DbCfg.Passwd, DbCfg.Host, DbCfg.Name) + if DbCfg.Host[0] == '/' { // looks like a unix socket + cnnstr = fmt.Sprintf("%s:%s@unix(%s)/%s?charset=utf8", + DbCfg.User, DbCfg.Passwd, DbCfg.Host, DbCfg.Name) + } else { + cnnstr = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8", + DbCfg.User, DbCfg.Passwd, DbCfg.Host, DbCfg.Name) + } case "postgres": var host, port = "127.0.0.1", "5432" fields := strings.Split(DbCfg.Host, ":") |