From 56cf05be771977abd9ae2e68dd446092c595981c Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 14 Mar 2014 01:40:34 -0400 Subject: [PATCH] Add errHandler mid ware --- modules/log/error.go | 32 ++++++++++++++++++++++++++++++++ routers/repo/repo.go | 9 ++++----- web.go | 1 + 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 modules/log/error.go diff --git a/modules/log/error.go b/modules/log/error.go new file mode 100644 index 0000000000..cb94ec2473 --- /dev/null +++ b/modules/log/error.go @@ -0,0 +1,32 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package log + +import ( + "github.com/codegangsta/martini" + "github.com/martini-contrib/render" +) + +// ErrHandler is an interface for custom error handler. +type ErrHandler interface { + Handle(string, render.Render, error) +} + +// ErrHandle is a Middleware that maps a ErrHandler service into the Martini handler chain. +func ErrHandle() martini.Handler { + return func(context martini.Context) { + context.MapTo(&errHandler{}, (*ErrHandler)(nil)) + } +} + +type errHandler struct { +} + +func (eh *errHandler) Handle(title string, r render.Render, err error) { + Error("%s: %v", title, err) + r.HTML(200, "base/error", map[string]interface{}{ + "ErrorMsg": err, + }) +} diff --git a/routers/repo/repo.go b/routers/repo/repo.go index e1809b4b7e..1c9bb0500c 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -5,9 +5,10 @@ package repo import ( + "net/http" + "github.com/martini-contrib/render" "github.com/martini-contrib/sessions" - "net/http" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" @@ -15,7 +16,7 @@ import ( "github.com/gogits/gogs/modules/log" ) -func Create(form auth.CreateRepoForm, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) { +func Create(form auth.CreateRepoForm, req *http.Request, r render.Render, data base.TmplData, session sessions.Session, eh log.ErrHandler) { data["Title"] = "Create repository" if req.Method == "GET" { @@ -63,9 +64,7 @@ func Create(form auth.CreateRepoForm, req *http.Request, r render.Render, data b return } - data["ErrorMsg"] = err - log.Error("repo.Create: %v", err) - r.HTML(200, "base/error", data) + eh.Handle("repo.Create", r, err) } func Delete(form auth.DeleteRepoForm, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) { diff --git a/web.go b/web.go index 1fa19afc17..30e881bba1 100644 --- a/web.go +++ b/web.go @@ -50,6 +50,7 @@ func runWeb(*cli.Context) { // Middlewares. m.Use(render.Renderer(render.Options{Funcs: []template.FuncMap{AppHelpers}})) m.Use(base.InitContext()) + m.Use(log.ErrHandle()) // TODO: should use other store because cookie store is not secure. store := sessions.NewCookieStore([]byte("secret123"))