aboutsummaryrefslogtreecommitdiff
path: root/models/models.go
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-14 22:48:01 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-14 22:48:01 -0400
commit5378bb326b14192cbbc1309c3142cfc49c74a882 (patch)
tree6fadfeb201764665d80467306509e50648c9fedc /models/models.go
parent4210f56dbcf0940f5cb181022501ec6fee5eebbb (diff)
parentdf0c61cc628c90000c7f481a7ec62dae9bbdfc4e (diff)
Merge branch 'master' of github.com:gogits/gogs into dev
Diffstat (limited to 'models/models.go')
-rw-r--r--models/models.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/models/models.go b/models/models.go
index cd9dc38a..fe17229c 100644
--- a/models/models.go
+++ b/models/models.go
@@ -89,8 +89,16 @@ func SetEngine() (err error) {
orm, err = xorm.NewEngine("mysql", fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8",
DbCfg.User, DbCfg.Pwd, DbCfg.Host, DbCfg.Name))
case "postgres":
- orm, err = xorm.NewEngine("postgres", fmt.Sprintf("user=%s password=%s dbname=%s sslmode=%s",
- DbCfg.User, DbCfg.Pwd, DbCfg.Name, DbCfg.SslMode))
+ var host, port = "127.0.0.1", "5432"
+ fields := strings.Split(DbCfg.Host, ":")
+ if len(fields) > 0 {
+ host = fields[0]
+ }
+ if len(fields) > 1 {
+ port = fields[1]
+ }
+ orm, err = xorm.NewEngine("postgres", fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s",
+ DbCfg.User, DbCfg.Pwd, host, port, DbCfg.Name, DbCfg.SslMode))
case "sqlite3":
os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
orm, err = xorm.NewEngine("sqlite3", DbCfg.Path)