Browse Source

models: fix XORM API break

cmd/web.go: check version after load config
Unknwon 10 years ago
parent
commit
685ed1f807
4 changed files with 4 additions and 5 deletions
  1. 1 2
      cmd/web.go
  2. 1 1
      gogs.go
  3. 1 1
      models/models.go
  4. 1 1
      templates/.VERSION

+ 1 - 2
cmd/web.go

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

+ 1 - 1
gogs.go

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

+ 1 - 1
models/models.go

@@ -121,7 +121,7 @@ func SetEngine() (err error) {
 	if err != nil {
 		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.ShowInfo = true

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.5.13.0212 Beta
+0.5.13.0214 Beta