diff --git a/ierrors/errors.go b/ierrors/errors.go index 0ceb8395..312464a7 100644 --- a/ierrors/errors.go +++ b/ierrors/errors.go @@ -31,11 +31,6 @@ func (e *Error) StackTrace() []uintptr { return e.stack } -func (e *Error) SetUnexpected(u bool) *Error { - e.Unexpected = u - return e -} - func New(status int, msg string, pub string) *Error { return &Error{ StatusCode: status, diff --git a/imagedata/download.go b/imagedata/download.go index 69e6a871..38820122 100644 --- a/imagedata/download.go +++ b/imagedata/download.go @@ -116,7 +116,7 @@ func headersToStore(res *http.Response) map[string]string { func requestImage(imageURL string, header http.Header) (*http.Response, error) { req, err := http.NewRequest("GET", imageURL, nil) if err != nil { - return nil, ierrors.New(404, err.Error(), msgSourceImageIsUnreachable).SetUnexpected(config.ReportDownloadingErrors) + return nil, ierrors.New(404, err.Error(), msgSourceImageIsUnreachable) } if _, ok := enabledSchemes[req.URL.Scheme]; !ok { @@ -124,7 +124,7 @@ func requestImage(imageURL string, header http.Header) (*http.Response, error) { 404, fmt.Sprintf("Unknown sheme: %s", req.URL.Scheme), msgSourceImageIsUnreachable, - ).SetUnexpected(config.ReportDownloadingErrors) + ) } req.Header.Set("User-Agent", config.UserAgent) @@ -137,7 +137,7 @@ func requestImage(imageURL string, header http.Header) (*http.Response, error) { res, err := downloadClient.Do(req) if err != nil { - return nil, ierrors.New(500, checkTimeoutErr(err).Error(), msgSourceImageIsUnreachable).SetUnexpected(config.ReportDownloadingErrors) + return nil, ierrors.New(500, checkTimeoutErr(err).Error(), msgSourceImageIsUnreachable) } if res.StatusCode == http.StatusNotModified { @@ -154,7 +154,7 @@ func requestImage(imageURL string, header http.Header) (*http.Response, error) { } msg := fmt.Sprintf("Status: %d; %s", res.StatusCode, string(body)) - return nil, ierrors.New(status, msg, msgSourceImageIsUnreachable).SetUnexpected(config.ReportDownloadingErrors) + return nil, ierrors.New(status, msg, msgSourceImageIsUnreachable) } return res, nil @@ -191,7 +191,7 @@ func download(imageURL string, header http.Header) (*ImageData, error) { imgdata, err := readAndCheckImage(body, contentLength) if err != nil { - return nil, ierrors.Wrap(err, 0).SetUnexpected(config.ReportDownloadingErrors) + return nil, ierrors.Wrap(err, 0) } imgdata.Headers = headersToStore(res) diff --git a/processing_handler.go b/processing_handler.go index f0a1bba8..81df864e 100644 --- a/processing_handler.go +++ b/processing_handler.go @@ -227,7 +227,7 @@ func handleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) { if ierrok { statusCode = ierr.StatusCode } - if !ierrok || ierr.Unexpected { + if !ierrok || ierr.Unexpected || config.ReportDownloadingErrors { errorreport.Report(err, r) }