lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2025-07-02 12:50:18 +00:00
Code Issues Releases Activity

update abort & error show & sessionRelease in defer

Browse Source
This commit is contained in:
astaxie
2013-12-16 22:54:29 +08:00
parent 7fd18ba639
commit f8708d01bf
4 changed files with 31 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
router.go
View File

@ -376,6 +376,12 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
if !RecoverPanic {
panic(err)
} else {
if ErrorsShow {
if handler, ok := middleware.ErrorMaps[fmt.Sprint(err)]; ok {
handler(rw, r)
return
}
}
var stack string
Critical("Handler crashed with error", err)
for i := 1; ; i++ {
@ -389,12 +395,13 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
middleware.ShowErr(err, rw, r, stack)
}
} else {
if ErrorsShow {
handler := p.getErrorHandler(fmt.Sprint(err))
handler(rw, r)
if !RecoverPanic {
panic(err)
} else {
if !RecoverPanic {
panic(err)
// in production model show all infomation
if ErrorsShow {
handler := p.getErrorHandler(fmt.Sprint(err))
handler(rw, r)
} else {
Critical("Handler crashed with error", err)
for i := 1; ; i++ {
@ -525,6 +532,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
// session init after static file
if SessionOn {
context.Input.CruSession = GlobalSessions.SessionStart(w, r)
defer context.Input.CruSession.SessionRelease()
}
if do_filter(AfterStatic) {
@ -744,9 +752,6 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
if do_filter(AfterExec) {
goto Admin
}
method = vc.MethodByName("Destructor")
method.Call(in)
}
//start autorouter
@ -835,9 +840,6 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
goto Admin
}
method = vc.MethodByName("Destructor")
method.Call(in)
goto Admin
}
}