0692f928 by astaxie

Merge branch 'develop' of https://github.com/astaxie/beego into develop

2 parents 41adcf99 e6b42a40
...@@ -818,8 +818,8 @@ func (p *ControllerRegistor) recoverPanic(rw http.ResponseWriter, r *http.Reques ...@@ -818,8 +818,8 @@ func (p *ControllerRegistor) recoverPanic(rw http.ResponseWriter, r *http.Reques
818 if !ok { 818 if !ok {
819 break 819 break
820 } 820 }
821 Critical(file, line) 821 Critical(fmt.Sprintf("%s:%d", file, line))
822 stack = stack + fmt.Sprintln(file, line) 822 stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d", file, line))
823 } 823 }
824 middleware.ShowErr(err, rw, r, stack) 824 middleware.ShowErr(err, rw, r, stack)
825 } 825 }
...@@ -840,7 +840,7 @@ func (p *ControllerRegistor) recoverPanic(rw http.ResponseWriter, r *http.Reques ...@@ -840,7 +840,7 @@ func (p *ControllerRegistor) recoverPanic(rw http.ResponseWriter, r *http.Reques
840 if !ok { 840 if !ok {
841 break 841 break
842 } 842 }
843 Critical(file, line) 843 Critical(fmt.Sprintf("%s:%d", file, line))
844 } 844 }
845 } 845 }
846 } 846 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!