Add router log config option

This commit is contained in:
Unknown 2014-05-01 18:53:41 -04:00
parent 03c2468c2f
commit 100cd181bc
8 changed files with 32 additions and 9 deletions

View file

@ -50,6 +50,7 @@ var (
AppLogo string
AppUrl string
OfflineMode bool
RouterLog bool
ProdMode bool
Domain string
SecretKey string
@ -327,6 +328,7 @@ func NewConfigContext() {
AppUrl = Cfg.MustValue("server", "ROOT_URL")
Domain = Cfg.MustValue("server", "DOMAIN")
OfflineMode = Cfg.MustBool("server", "OFFLINE_MODE", false)
RouterLog = Cfg.MustBool("server", "ROUTER_LOG", true)
SecretKey = Cfg.MustValue("security", "SECRET_KEY")
InstallLock = Cfg.MustBool("security", "INSTALL_LOCK", false)

View file

@ -106,11 +106,19 @@ func (ctx *Context) RenderWithErr(msg, tpl string, form auth.Form) {
// Handle handles and logs error by given status.
func (ctx *Context) Handle(status int, title string, err error) {
log.Error("%s: %v", title, err)
if martini.Dev != martini.Prod {
ctx.Data["ErrorMsg"] = err
if err != nil {
log.Error("%s: %v", title, err)
if martini.Dev != martini.Prod {
ctx.Data["ErrorMsg"] = err
}
}
switch status {
case 404:
ctx.Data["Title"] = "Page Not Found"
case 500:
ctx.Data["Title"] = "Internal Server Error"
}
ctx.HTML(status, fmt.Sprintf("status/%d", status))
}

View file

@ -12,6 +12,8 @@ import (
"time"
"github.com/go-martini/martini"
"github.com/gogits/gogs/modules/base"
)
var isWindows bool
@ -22,6 +24,10 @@ func init() {
func Logger() martini.Handler {
return func(res http.ResponseWriter, req *http.Request, ctx martini.Context, log *log.Logger) {
if !base.RouterLog {
return
}
start := time.Now()
log.Printf("Started %s %s", req.Method, req.URL.Path)