Add log.handle

diff --git a/modules/log/log.go b/modules/log/log.go
index f71be7c1330c06dba6e74e34aa2b5e47868cfef7..b3a3e0a63c0f7740ba244a60e124e4a815fe58ce 100644 (file)
--- a/modules/log/log.go
+++ b/modules/log/log.go
@@ -6,6 +6,8 @@
 package log
 
 import (
+       "fmt"
+
        "github.com/martini-contrib/render"
 
        "github.com/gogits/logs"
@@ -40,8 +42,8 @@ func Critical(format string, v ...interface{}) {
        logger.Critical(format, v...)
 }
 
-func Handle(status int, title, tmpl string, data base.TmplData, r render.Render, err error) {
+func Handle(status int, title string, data base.TmplData, r render.Render, err error) {
        data["ErrorMsg"] = err
        Error("%s: %v", title, err)
-       r.HTML(status, tmpl, data)
+       r.HTML(status, fmt.Sprintf("status/%d", status), data)
 }

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 706b4f937d5623f2d21a45b7c0de102d5a4deddc..b25ce1899c688a2ba3a7ffa3344710fe0b80d01e 100644 (file)
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -64,7 +64,7 @@ func Create(form auth.CreateRepoForm, req *http.Request, r render.Render, data b
                return
        }
 
-       log.Handle(200, "repo.Create", "base/error", data, r, err)
+       log.Handle(200, "repo.Create", data, r, err)
 }
 
 func Delete(form auth.DeleteRepoForm, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
@@ -76,9 +76,7 @@ func Delete(form auth.DeleteRepoForm, req *http.Request, r render.Render, data b
        }
 
        if err := models.DeleteRepository(form.UserId, form.RepoId, form.UserName); err != nil {
-               data["ErrorMsg"] = err
-               log.Error("repo.Delete: %v", err)
-               r.HTML(200, "base/error", data)
+               log.Handle(200, "repo.Delete", data, r, err)
                return
        }
 
@@ -95,9 +93,7 @@ func List(req *http.Request, r render.Render, data base.TmplData, session sessio
        data["Title"] = "Repositories"
        repos, err := models.GetRepositories(u)
        if err != nil {
-               data["ErrorMsg"] = err
-               log.Error("repo.List: %v", err)
-               r.HTML(200, "base/error", data)
+               log.Handle(200, "repo.List", data, r, err)
                return
        }
 

diff --git a/routers/repo/single.go b/routers/repo/single.go
index 1d5e601aa30fb680dc735d5a6df93ac2b6a60dcb..489666f406dc8cdd0d0d7e488272ddf9443e6a06 100644 (file)
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -16,9 +16,7 @@ func Single(params martini.Params, r render.Render, data base.TmplData) {
 
        files, err := models.GetReposFiles(params["username"], params["reponame"], "HEAD", "/")
        if err != nil {
-               data["ErrorMsg"] = err
-               log.Error("repo.List: %v", err)
-               r.HTML(200, "base/error", data)
+               log.Handle(200, "repo.Single", data, r, err)
                return
        }
 

diff --git a/routers/user/setting.go b/routers/user/setting.go
index 08879ae4a7e7fd6605e84882a0366c8e9cdd95cb..b01d27d845e097725fe30d046ca0539f91c1f0e3 100644 (file)
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -40,9 +40,7 @@ func Setting(form auth.UpdateProfileForm, r render.Render, data base.TmplData, r
        user.Avatar = base.EncodeMd5(form.Avatar)
        user.AvatarEmail = form.Avatar
        if err := models.UpdateUser(user); err != nil {
-               data["ErrorMsg"] = err
-               log.Error("setting.Setting: %v", err)
-               r.HTML(200, "base/error", data)
+               log.Handle(200, "setting.Setting", data, r, err)
                return
        }
 
@@ -62,9 +60,7 @@ func SettingPassword(form auth.UpdatePasswdForm, r render.Render, data base.Tmpl
        user := auth.SignedInUser(session)
        newUser := &models.User{Passwd: form.NewPasswd}
        if err := newUser.EncodePasswd(); err != nil {
-               data["ErrorMsg"] = err
-               log.Error("setting.UpdatePasswd: %v", err)
-               r.HTML(200, "base/error", data)
+               log.Handle(200, "setting.SettingPassword", data, r, err)
                return
        }
 
@@ -77,9 +73,7 @@ func SettingPassword(form auth.UpdatePasswdForm, r render.Render, data base.Tmpl
        } else {
                user.Passwd = newUser.Passwd
                if err := models.UpdateUser(user); err != nil {
-                       data["ErrorMsg"] = err
-                       log.Error("setting.UpdatePasswd: %v", err)
-                       r.HTML(200, "base/error", data)
+                       log.Handle(200, "setting.SettingPassword", data, r, err)
                        return
                }
                data["IsSuccess"] = true

diff --git a/routers/user/user.go b/routers/user/user.go
index 2ce158b641ab552826415882d52c354dd5c3cc1e..6095b53808bfbb0afad2e85eea297c7e3fe447c3 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -22,9 +22,7 @@ func Dashboard(r render.Render, data base.TmplData, session sessions.Session) {
        data["PageIsUserDashboard"] = true
        repos, err := models.GetRepositories(&models.User{Id: auth.SignedInId(session)})
        if err != nil {
-               data["ErrorMsg"] = err
-               log.Error("dashboard: %v", err)
-               r.HTML(200, "base/error", data)
+               log.Handle(200, "user.Dashboard", data, r, err)
                return
        }
        data["MyRepos"] = repos
@@ -37,9 +35,7 @@ func Profile(params martini.Params, r render.Render, data base.TmplData, session
        // TODO: Need to check view self or others.
        user, err := models.GetUserByName(params["username"])
        if err != nil {
-               data["ErrorMsg"] = err
-               log.Error("user.Profile: %v", err)
-               r.HTML(200, "base/error", data)
+               log.Handle(200, "user.Profile", data, r, err)
                return
        }
 
@@ -70,9 +66,7 @@ func SignIn(form auth.LogInForm, data base.TmplData, req *http.Request, r render
                        return
                }
 
-               data["ErrorMsg"] = err
-               log.Error("user.SignIn: %v", err)
-               r.HTML(200, "base/error", data)
+               log.Handle(200, "user.SignIn", data, r, err)
                return
        }
 
@@ -129,9 +123,7 @@ func SignUp(form auth.RegisterForm, data base.TmplData, req *http.Request, r ren
                        data["ErrorMsg"] = "E-mail address has been already used"
                        r.HTML(200, "user/signup", data)
                default:
-                       data["ErrorMsg"] = err
-                       log.Error("user.SignUp: %v", data)
-                       r.HTML(200, "base/error", nil)
+                       log.Handle(200, "user.SignUp", data, r, err)
                }
                return
        }
@@ -155,9 +147,7 @@ func Delete(data base.TmplData, req *http.Request, session sessions.Session, r r
                case models.ErrUserOwnRepos.Error():
                        data["ErrorMsg"] = "Your account still have ownership of repository, you have to delete or transfer them first."
                default:
-                       data["ErrorMsg"] = err
-                       log.Error("user.Delete: %v", data)
-                       r.HTML(200, "base/error", nil)
+                       log.Handle(200, "user.Delete", data, r, err)
                        return
                }
        }

diff --git a/templates/base/error.tmpl b/templates/base/error.tmpl
deleted file mode 100644 (file)
index 8f64494..0000000
--- a/templates/base/error.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="gogs-body" class="container">
-       <p>An error is occurred : {{.ErrorMsg}}</p>
-       <p>Application Version: {{AppVer}}</p>
-</div>
-{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/status/200.tmpl b/templates/status/200.tmpl
new file mode 100644 (file)
index 0000000..8f64494
--- /dev/null
+++ b/templates/status/200.tmpl
@@ -0,0 +1,7 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="gogs-body" class="container">
+       <p>An error is occurred : {{.ErrorMsg}}</p>
+       <p>Application Version: {{AppVer}}</p>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file