Skip to content

Commit 55dd8e3

Browse files
broccoliDaniel Auer
authored andcommitted
fix: adjusted error handling
1 parent 803bc0f commit 55dd8e3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

internal/base/middleware/avatar.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package middleware
2121

2222
import (
2323
"fmt"
24+
"net/http"
2425
"net/url"
2526
"os"
2627
"path"
@@ -62,7 +63,8 @@ func (am *AvatarMiddleware) AvatarThumb() gin.HandlerFunc {
6263
filePath, err = am.uploaderService.AvatarThumbFile(ctx, filename, size)
6364
if err != nil {
6465
log.Error(err)
65-
ctx.Abort()
66+
ctx.AbortWithStatus(http.StatusNotFound)
67+
return
6668
}
6769
}
6870
avatarFile, err := os.ReadFile(filePath)

internal/service/uploader/upload.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (us *uploaderService) AvatarThumbFile(ctx *gin.Context, fileName string, si
155155
filePath := fmt.Sprintf("%s/%s/%s", us.serviceConfig.UploadPath, constant.AvatarSubPath, fileName)
156156
avatarFile, err = os.ReadFile(filePath)
157157
if err != nil {
158-
return "", errors.InternalServer(reason.UnknownError).WithError(err).WithStack()
158+
return "", errors.NotFound(reason.UnknownError).WithError(err)
159159
}
160160
reader := bytes.NewReader(avatarFile)
161161
img, err := imaging.Decode(reader)

0 commit comments

Comments
 (0)