go/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-02-07 11:36:25 +02:00
Code Releases Activity

Better stacktrace of processing errorf

Browse Source
This commit is contained in:
DarthSim 2019-05-08 20:37:26 +06:00
parent 3d13e6afb2
commit 023dcadc34
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
errors.go
View File

@ -20,14 +20,17 @@ func newError(status int, msg string, pub string) *imgproxyError {
return &imgproxyError{status, msg, pub}
}
func newUnexpectedError(err error, skip int) *imgproxyError {
msg := fmt.Sprintf("Unexpected error: %s\n%s", err, stacktrace(skip+1))
return &imgproxyError{500, msg, "Internal error"}
func newUnexpectedError(msg string, skip int) *imgproxyError {
return &imgproxyError{
500,
fmt.Sprintf("Unexpected error: %s\n%s", msg, stacktrace(skip+3)),
"Internal error",
}
}
func stacktrace(skip int) string {
callers := make([]uintptr, 10)
n := runtime.Callers(skip+1, callers)
n := runtime.Callers(skip, callers)
lines := make([]string, n)
for i, pc := range callers[:n] {

2
process.go
View File

@ -1048,5 +1048,5 @@ func vipsApplyWatermark(img **C.VipsImage, opts *watermarkOptions) error {
}
func vipsError() error {
return errors.New(C.GoString(C.vips_error_buffer()))
return newUnexpectedError(C.GoString(C.vips_error_buffer()), 1)
}

2
server.go
View File

@ -240,7 +240,7 @@ func (h *httpHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
if ierr, ok := err.(*imgproxyError); ok {
respondWithError(reqID, rw, ierr)
} else {
respondWithError(reqID, rw, newUnexpectedError(err, 4))
respondWithError(reqID, rw, newUnexpectedError(err.Error(), 3))
}
} else {
panic(rerr)