go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-01-23 18:51:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace panic with a message when MustRender fails

Browse Source
This commit is contained in:
Gerasimos Maropoulos 2016-10-15 20:48:06 +03:00
parent 9a0ef4822c
commit 89abc3349d
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
context.go
View File

@ -664,7 +664,7 @@ func (ctx *Context) Render(name string, binding interface{}, options ...map[stri
// Note: the options: "gzip" and "charset" are built'n support by Iris, so you can pass these on any template engine or serialize engine // Note: the options: "gzip" and "charset" are built'n support by Iris, so you can pass these on any template engine or serialize engine
func (ctx *Context) MustRender(name string, binding interface{}, options ...map[string]interface{}) { func (ctx *Context) MustRender(name string, binding interface{}, options ...map[string]interface{}) {
if err := ctx.Render(name, binding, options...); err != nil { if err := ctx.Render(name, binding, options...); err != nil {
ctx.Panic() ctx.HTML(StatusServiceUnavailable, fmt.Sprintf("<h2>Template: %s\nIP: %s</h2><b>%s</b>", name, ctx.RemoteAddr(), err.Error()))
if ctx.framework.Config.IsDevelopment { if ctx.framework.Config.IsDevelopment {
ctx.framework.Logger.Printf("MustRender panics for client with IP: %s On template: %s.Trace: %s\n", ctx.RemoteAddr(), name, err) ctx.framework.Logger.Printf("MustRender panics for client with IP: %s On template: %s.Trace: %s\n", ctx.RemoteAddr(), name, err)
} }

19
context_test.go
View File

@ -771,3 +771,22 @@ func TestContextPreRender(t *testing.T) {
expected := "<h1>HI kataras. Error: " + errMsg1 + errMsg2 + "</h1>" expected := "<h1>HI kataras. Error: " + errMsg1 + errMsg2 + "</h1>"
e.GET("/").Expect().Status(iris.StatusOK).Body().Contains(expected) e.GET("/").Expect().Status(iris.StatusOK).Body().Contains(expected)
} }
func TestTemplatesDisabled(t *testing.T) {
iris.ResetDefault()
defer iris.Close()
iris.Default.Config.DisableTemplateEngines = true
file := "index.html"
ip := "0.0.0.0"
errTmpl := "<h2>Template: %s\nIP: %s</h2><b>%s</b>"
expctedErrMsg := fmt.Sprintf(errTmpl, file, ip, "Error: Unable to execute a template. Trace: Templates are disabled '.Config.DisableTemplatesEngines = true' please turn that to false, as defaulted.\n")
iris.Get("/renderErr", func(ctx *iris.Context) {
ctx.MustRender(file, nil)
})
e := httptest.New(iris.Default, t)
e.GET("/renderErr").Expect().Status(iris.StatusServiceUnavailable).Body().Equal(expctedErrMsg)
}

5
template.go
View File

@ -72,6 +72,10 @@ func (t *templateEngines) usePreRender(pre PreRender) {
// the gzip and charset options are built'n with iris // the gzip and charset options are built'n with iris
// template is passed as file or souce // template is passed as file or souce
func (t *templateEngines) render(isFile bool, ctx *Context, filenameOrSource string, binding interface{}, options []map[string]interface{}) error { func (t *templateEngines) render(isFile bool, ctx *Context, filenameOrSource string, binding interface{}, options []map[string]interface{}) error {
if ctx.framework.Config.DisableTemplateEngines {
return errTemplateExecute.Format("Templates are disabled '.Config.DisableTemplatesEngines = true' please turn that to false, as defaulted.")
}
if len(t.prerenders) > 0 { if len(t.prerenders) > 0 {
for i := range t.prerenders { for i := range t.prerenders {
// I'm not making any checks here for performance reasons, means that // I'm not making any checks here for performance reasons, means that
@ -114,6 +118,7 @@ func (t *templateEngines) render(isFile bool, ctx *Context, filenameOrSource str
} else { } else {
out = ctx.Response.BodyWriter() out = ctx.Response.BodyWriter()
} }
if isFile { if isFile {
return t.ExecuteWriter(out, filenameOrSource, binding, options...) return t.ExecuteWriter(out, filenameOrSource, binding, options...)
} }