Skip to content

Commit 197fd7e

Browse files
author
JojiiOfficial
committed
Fix & improve error messages
1 parent 0de0aac commit 197fd7e

3 files changed

Lines changed: 11 additions & 14 deletions

File tree

handlers/Errors.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,33 +54,33 @@ func NewRequestError(msg string, code int) *RequestError {
5454
}
5555

5656
// Prepend text to the error
57-
func (re *RequestError) Prepend(txt string) *RequestError {
57+
func (re RequestError) Prepend(txt string) *RequestError {
5858
// Check if space has to be added
5959
if strings.HasSuffix(txt, " ") || strings.HasPrefix(re.Message, " ") {
6060
re.Message = txt + re.Message
6161
} else {
62-
re.Message = txt + " " + re.Message
62+
re.Message = txt + " " + re.Message
6363
}
6464

65-
return re
65+
return &re
6666
}
6767

6868
// Append text to the error
69-
func (re *RequestError) Append(txt string) *RequestError {
69+
func (re RequestError) Append(txt string) *RequestError {
7070
// Check if space has to be added
7171
if strings.HasSuffix(re.Message, " ") || strings.HasPrefix(txt, " ") {
7272
re.Message += txt
7373
} else {
7474
re.Message += " " + txt
7575
}
7676

77-
return re
77+
return &re
7878
}
7979

8080
// WithCode uses a different HTTP responsecode
81-
func (re *RequestError) WithCode(code int) *RequestError {
81+
func (re RequestError) WithCode(code int) *RequestError {
8282
re.ResponseCode = code
83-
return re
83+
return &re
8484
}
8585

8686
// Implement String for error

handlers/FileAttrHandler.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func AttributeHandler(handlerData web.HandlerData, w http.ResponseWriter, r *htt
6262

6363
// Find instance
6464
tag, err := models.FindTag(handlerData.Db, request.Name, namespace, handlerData.User)
65-
if tag == nil || LogError(err) {
65+
if tag == nil && err != nil {
6666
return RErrNotFound.Prepend("Tag")
6767
}
6868

@@ -73,9 +73,8 @@ func AttributeHandler(handlerData web.HandlerData, w http.ResponseWriter, r *htt
7373
tag.Name = request.NewName
7474
err := handlerData.Db.Save(tag).Error
7575

76-
if LogError(err) {
77-
sendServerError(w)
78-
return nil
76+
if err != nil {
77+
return err
7978
}
8079
}
8180
case "delete":
@@ -96,7 +95,6 @@ func AttributeHandler(handlerData web.HandlerData, w http.ResponseWriter, r *htt
9695
}
9796
case "get":
9897
{
99-
10098
var tags []models.Tag
10199
err := handlerData.Db.Model(&models.Tag{}).Where("namespace_id=?", namespace.ID).Find(&tags).Error
102100
if err != nil {
@@ -175,7 +173,6 @@ func AttributeHandler(handlerData web.HandlerData, w http.ResponseWriter, r *htt
175173
}
176174
case "get":
177175
{
178-
179176
var groups []models.Group
180177
err := handlerData.Db.Model(&models.Group{}).Where("namespace_id=?", namespace.ID).Find(&groups).Error
181178
if err != nil {

handlers/Router.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func RouteHandler(requestType requestType, handlerData *web.HandlerData, inner R
215215

216216
// Process request and handle its error
217217
if err := inner(*handlerData, w, r); err != nil {
218-
if e, ok := err.(RequestError); ok {
218+
if e, ok := err.(*RequestError); ok {
219219
// Send error response to user
220220
sendResponse(w, models.ResponseError, e.String(), "", e.ResponseCode)
221221

0 commit comments

Comments
 (0)