diff --git a/.gopmfile b/.gopmfile index bd641a17cb..9857af3502 100644 --- a/.gopmfile +++ b/.gopmfile @@ -3,18 +3,22 @@ path=github.com/gogits/gogs [deps] github.com/codegangsta/cli= -github.com/codegangsta/martini= +github.com/go-martini/martini= github.com/Unknwon/com= github.com/Unknwon/cae= github.com/Unknwon/goconfig= github.com/dchest/scrypt= github.com/nfnt/resize= github.com/lunny/xorm= +github.com/go-sql-driver/mysql= +github.com/lib/pq= github.com/gogits/logs= github.com/gogits/binding= github.com/gogits/git= github.com/gogits/gfm= github.com/gogits/cache= +github.com/gogits/session= +github.com/gogits/webdav= [res] include=templates|public|conf diff --git a/models/models.go b/models/models.go index a626b98f6e..384f1fc425 100644 --- a/models/models.go +++ b/models/models.go @@ -83,15 +83,19 @@ func SetEngine() (err error) { // WARNNING: for serv command, MUST remove the output to os.stdout, // so use log file to instead print to stdout. + execDir, _ := base.ExecDir() + logPath := execDir + "/log/xorm.log" + os.MkdirAll(path.Dir(logPath), os.ModePerm) - //x.ShowDebug = true - //orm.ShowErr = true - f, err := os.Create("xorm.log") + f, err := os.Create(logPath) if err != nil { return fmt.Errorf("models.init(fail to create xorm.log): %v\n", err) } orm.Logger = f + orm.ShowSQL = true + orm.ShowDebug = true + orm.ShowErr = true return nil } diff --git a/serve.go b/serve.go index 96cd7e73de..afc16c281b 100644 --- a/serve.go +++ b/serve.go @@ -47,7 +47,7 @@ func newLogger(execDir string) { level := "0" logPath := execDir + "/log/serv.log" os.MkdirAll(path.Dir(logPath), os.ModePerm) - log.NewLogger(10000, "file", fmt.Sprintf(`{"level":%s,"filename":"%s"}`, level, logPath)) + log.NewLogger(0, "file", fmt.Sprintf(`{"level":%s,"filename":"%s"}`, level, logPath)) log.Trace("start logging...") } diff --git a/tests/README.md b/tests/README.md index 98693257f2..e51b251037 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,11 +1,13 @@ -## gogs test +## Gogs Test -this is for developers +This is for developers. + +## Prepare Environment -## prepare environment go get -u github.com/shxsun/travelexec # start gogs server gogs web -## start test +## Start Testing + travelexec diff --git a/update.go b/update.go index e36dc22329..5ccb72fd4f 100644 --- a/update.go +++ b/update.go @@ -6,17 +6,19 @@ package main import ( "container/list" + "fmt" "os" "os/exec" + "path" "strconv" "strings" "github.com/codegangsta/cli" - //"github.com/gogits/gogs/modules/log" "github.com/gogits/git" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" - "github.com/qiniu/log" + "github.com/gogits/gogs/modules/log" + //"github.com/qiniu/log" ) var CmdUpdate = cli.Command{ @@ -28,25 +30,29 @@ gogs serv provide access auth for repositories`, Flags: []cli.Flag{}, } +func newUpdateLogger(execDir string) { + level := "0" + logPath := execDir + "/log/update.log" + os.MkdirAll(path.Dir(logPath), os.ModePerm) + log.NewLogger(0, "file", fmt.Sprintf(`{"level":%s,"filename":"%s"}`, level, logPath)) + log.Trace("start logging...") +} + // for command: ./gogs update func runUpdate(c *cli.Context) { + execDir, _ := base.ExecDir() + newLogger(execDir) + base.NewConfigContext() models.LoadModelsConfig() if models.UseSQLite3 { - execDir, _ := base.ExecDir() os.Chdir(execDir) } models.SetEngine() - w, _ := os.Create("update.log") - defer w.Close() - - log.SetOutput(w) - args := c.Args() - //log.Info(args) if len(args) != 3 { log.Error("received less 3 parameters") return