Merge pull request #13 from objenious/go/std_unwrap_error

b-2-83 · web-flow · commit 9c4b3ad0567f · 2021-05-10T16:19:10.000+02:00
use standard error unwrap for cause
diff --git a/http.go b/http.go
@@ -1,6 +1,9 @@
 package errorutil
 
-import "net/http"
+import (
+	"errors"
+	"net/http"
+)
 
 // HTTPStatusCodeEr defines errors that should return a specific HTTP status code
 type HTTPStatusCodeEr interface {
@@ -55,10 +58,11 @@ func HTTPStatusCode(err error) int {
 			return http.StatusRequestTimeout
 		}
 		cause, ok := err.(causer)
-		if !ok {
-			break
+		if ok {
+			err = cause.Cause()
+		} else {
+			err = errors.Unwrap(err)
 		}
-		err = cause.Cause()
 	}
 	return http.StatusInternalServerError
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`package errorutil`
`2`	`2`
`3`		`-import "net/http"`
	`3`	`+import (`
	`4`	`+ "errors"`
	`5`	`+ "net/http"`
	`6`	`+)`
`4`	`7`
`5`	`8`	`// HTTPStatusCodeEr defines errors that should return a specific HTTP status code`
`6`	`9`	`type HTTPStatusCodeEr interface {`
`@@ -55,10 +58,11 @@ func HTTPStatusCode(err error) int {`
`55`	`58`	`return http.StatusRequestTimeout`
`56`	`59`	`}`
`57`	`60`	`cause, ok := err.(causer)`
`58`		`- if !ok {`
`59`		`- break`
	`61`	`+ if ok {`
	`62`	`+ err = cause.Cause()`
	`63`	`+ } else {`
	`64`	`+ err = errors.Unwrap(err)`
`60`	`65`	`}`
`61`		`- err = cause.Cause()`
`62`	`66`	`}`
`63`	`67`	`return http.StatusInternalServerError`
`64`	`68`	`}`