diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-22 17:59:22 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-22 17:59:22 -0400 |
| commit | 7356153ba3c19ff49f3ecfa28bac0b8bb38eccb9 (patch) | |
| tree | d6cb7f9a7317eaddc981708e2a104020370e66d7 /modules | |
| parent | cb52f6d07d62925a31185fedf591d0241ee2bf63 (diff) | |
| download | gitea-7356153ba3c19ff49f3ecfa28bac0b8bb38eccb9.tar.gz gitea-7356153ba3c19ff49f3ecfa28bac0b8bb38eccb9.zip | |
Batch updates
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/base/conf.go | 4 | ||||
| -rw-r--r-- | modules/middleware/auth.go | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go index cdbe2b36ce..19f587077b 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -143,6 +143,10 @@ func newLogService() { Cfg.MustValue(modeSec, "HOST", "127.0.0.1:25"), Cfg.MustValue(modeSec, "RECEIVERS", "[]"), Cfg.MustValue(modeSec, "SUBJECT", "Diagnostic message from serve")) + case "database": + LogConfig = fmt.Sprintf(`{"level":%s,"driver":%s,"conn":%s}`, level, + Cfg.MustValue(modeSec, "Driver"), + Cfg.MustValue(modeSec, "CONN")) } log.NewLogger(Cfg.MustInt64("log", "BUFFER_LEN", 10000), LogMode, LogConfig) diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index 3224b3df91..82c3367c48 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -5,6 +5,8 @@ package middleware import ( + "net/url" + "github.com/codegangsta/martini" "github.com/gogits/gogs/modules/base" @@ -35,6 +37,7 @@ func Toggle(options *ToggleOptions) martini.Handler { if options.SignInRequire { if !ctx.IsSigned { + ctx.SetCookie("redirect_to", "/"+url.QueryEscape(ctx.Req.RequestURI)) ctx.Redirect("/user/login") return } else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm { |