improved log locations

tokarchuk/v1.17
Lunny Xiao 11 years ago
parent 76c64b43cb
commit a187ba9651
  1. 2
      conf/app.ini
  2. 10
      models/models.go
  3. 24
      update.go

@ -32,7 +32,7 @@ PATH = data/gogs.db
[admin] [admin]
[security] [security]
INSTALL_LOCK = false INSTALL_LOCK = true
; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!! ; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!!
SECRET_KEY = !#@FDEWREWR&*( SECRET_KEY = !#@FDEWREWR&*(
; Auto-login remember days ; Auto-login remember days

@ -83,15 +83,19 @@ func SetEngine() (err error) {
// WARNNING: for serv command, MUST remove the output to os.stdout, // WARNNING: for serv command, MUST remove the output to os.stdout,
// so use log file to instead print to 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 f, err := os.Create(logPath)
//orm.ShowErr = true
f, err := os.Create("xorm.log")
if err != nil { if err != nil {
return fmt.Errorf("models.init(fail to create xorm.log): %v\n", err) return fmt.Errorf("models.init(fail to create xorm.log): %v\n", err)
} }
orm.Logger = f orm.Logger = f
orm.ShowSQL = true orm.ShowSQL = true
orm.ShowDebug = true
orm.ShowErr = true
return nil return nil
} }

@ -6,17 +6,19 @@ package main
import ( import (
"container/list" "container/list"
"fmt"
"os" "os"
"os/exec" "os/exec"
"path"
"strconv" "strconv"
"strings" "strings"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
//"github.com/gogits/gogs/modules/log"
"github.com/gogits/git" "github.com/gogits/git"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/base"
"github.com/qiniu/log" "github.com/gogits/gogs/modules/log"
//"github.com/qiniu/log"
) )
var CmdUpdate = cli.Command{ var CmdUpdate = cli.Command{
@ -28,25 +30,29 @@ gogs serv provide access auth for repositories`,
Flags: []cli.Flag{}, 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 // for command: ./gogs update
func runUpdate(c *cli.Context) { func runUpdate(c *cli.Context) {
execDir, _ := base.ExecDir()
newLogger(execDir)
base.NewConfigContext() base.NewConfigContext()
models.LoadModelsConfig() models.LoadModelsConfig()
if models.UseSQLite3 { if models.UseSQLite3 {
execDir, _ := base.ExecDir()
os.Chdir(execDir) os.Chdir(execDir)
} }
models.SetEngine() models.SetEngine()
w, _ := os.Create("update.log")
defer w.Close()
log.SetOutput(w)
args := c.Args() args := c.Args()
//log.Info(args)
if len(args) != 3 { if len(args) != 3 {
log.Error("received less 3 parameters") log.Error("received less 3 parameters")
return return

Loading…
Cancel
Save