From a41a1fe60da5b02891640dd5f99758015b78bcc9 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 24 Jul 2014 12:49:40 -0400 Subject: [PATCH] Mirror fix --- cmd/web.go | 2 +- modules/middleware/context.go | 6 +----- modules/setting/setting.go | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/web.go b/cmd/web.go index d3ce68d370..0af79c3c37 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -206,7 +206,7 @@ func runWeb(*cli.Context) { r.Post("/:org/teams/new", bindIgnErr(auth.CreateTeamForm{}), org.NewTeamPost) r.Get("/:org/teams/:team/edit", org.EditTeam) - r.Get("/:org/team/:team",org.SingleTeam) + r.Get("/:org/team/:team", org.SingleTeam) r.Get("/:org/settings", org.Settings) r.Post("/:org/settings", bindIgnErr(auth.OrgSettingForm{}), org.SettingsPost) diff --git a/modules/middleware/context.go b/modules/middleware/context.go index c641449a87..6bd529cd1d 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -139,10 +139,6 @@ func (ctx *Context) Handle(status int, title string, err error) { ctx.HTML(status, base.TplName(fmt.Sprintf("status/%d", status))) } -func (ctx *Context) Debug(msg string, args ...interface{}) { - log.Debug(msg, args...) -} - func (ctx *Context) GetCookie(name string) string { cookie, err := ctx.Req.Cookie(name) if err != nil { @@ -356,7 +352,7 @@ func InitContext() martini.Handler { ctx.Session.SessionRelease(res) if flash := ctx.Flash.Encode(); len(flash) > 0 { - ctx.SetCookie("gogs_flash", ctx.Flash.Encode(), 0) + ctx.SetCookie("gogs_flash", flash, 0) } }) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index f03aa8aeae..717e81ada4 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -341,6 +341,7 @@ func newSessionService() { log.Fatal("Init session system failed, provider: %s, %v", SessionProvider, err) } + go SessionManager.GC() log.Info("Session Service Enabled") }