linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

models: fix XORM API break

Browse Source 
cmd/web.go: check version after load config
This commit is contained in:
Unknwon 2015-02-14 17:01:33 -05:00
parent a38e4a0b02
commit 685ed1f807
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/web.go
View File

@ -166,12 +166,11 @@ func newMacaron() *macaron.Macaron {
} }
func runWeb(ctx *cli.Context) { func runWeb(ctx *cli.Context) {
checkVersion()
if ctx.IsSet("config") { if ctx.IsSet("config") {
setting.CustomConf = ctx.String("config") setting.CustomConf = ctx.String("config")
} }
routers.GlobalInit() routers.GlobalInit()
checkVersion()
m := newMacaron() m := newMacaron()

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.5.13.0212 Beta" const APP_VER = "0.5.13.0214 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

2
models/models.go
View File

@ -121,7 +121,7 @@ func SetEngine() (err error) {
if err != nil { if err != nil {
return fmt.Errorf("models.init(fail to create xorm.log): %v", err) return fmt.Errorf("models.init(fail to create xorm.log): %v", err)
} }
x.Logger = xorm.NewSimpleLogger(f) x.SetLogger(xorm.NewSimpleLogger(f))
x.ShowSQL = true x.ShowSQL = true
x.ShowInfo = true x.ShowInfo = true

2
templates/.VERSION
View File

@ -1 +1 @@
0.5.13.0212 Beta 0.5.13.0214 Beta