Merge pull request #3142 from amitash1109/fix_response_http_code

Fix response http code

Merge pull request #3142 from amitash1109/fix_response_http_code
Fix response http code
f2589383 · astaxie · GitHub · 67a6b872 · af73a2d5 · f2589383
Unverified Commit f2589383 authored Jul 20, 2018 by astaxie Committed by GitHub Jul 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

config.go config.go +5 -1

error.go error.go +0 -5

No files found.
--- a/config.go
+++ b/config.go
@@ -182,7 +182,11 @@ func recoverPanic(ctx *context.Context) {
 		if BConfig.RunMode == DEV && BConfig.EnableErrorsRender {
 			showErr(err, ctx, stack)
 		}
-		ctx.ResponseWriter.WriteHeader(500)
+		if ctx.Output.Status != 0 {
+			ctx.ResponseWriter.WriteHeader(ctx.Output.Status)
+		} else {
+			ctx.ResponseWriter.WriteHeader(500)
+		}
 	}
 }

--- a/error.go
+++ b/error.go
@@ -93,11 +93,6 @@ func showErr(err interface{}, ctx *context.Context, stack string) {
 		"BeegoVersion":  VERSION,
 		"GoVersion":     runtime.Version(),
 	}
-	if ctx.Output.Status != 0 {
-		ctx.ResponseWriter.WriteHeader(ctx.Output.Status)
-	} else {
-		ctx.ResponseWriter.WriteHeader(500)
-	}
 	t.Execute(ctx.ResponseWriter, data)
 }