Skip to content

Errors stringifying enforced #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pzduniak merged 1 commit into from
Jan 13, 2015
Merged

Errors stringifying enforced #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions routes/accounts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) {
err := utils.ParseRequest(r, &input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to decode a request")

utils.JSONResponse(w, 400, &AccountsCreateResponse{
Expand Down Expand Up @@ -196,7 +196,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) {
token, err := env.Tokens.GetToken(input.Token)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to fetch a registration token from the database")

utils.JSONResponse(w, 400, &AccountsCreateResponse{
Expand Down Expand Up @@ -238,7 +238,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Unable to hash the password")
return
}
Expand All @@ -261,7 +261,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Could not insert an user into the database")
return
}
Expand Down Expand Up @@ -318,7 +318,7 @@ func AccountsCreate(w http.ResponseWriter, r *http.Request) {
err := env.Tokens.DeleteID(input.Token)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"id": input.Token,
}).Error("Could not remove token from database")
}
Expand Down Expand Up @@ -400,7 +400,7 @@ func AccountsUpdate(c web.C, w http.ResponseWriter, r *http.Request) {
err := utils.ParseRequest(r, &input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to decode a request")

utils.JSONResponse(w, 400, &AccountsUpdateResponse{
Expand Down Expand Up @@ -499,7 +499,7 @@ func AccountsUpdate(c web.C, w http.ResponseWriter, r *http.Request) {
err = user.SetPassword(input.NewPassword)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Unable to hash a password")

utils.JSONResponse(w, 500, &AccountsUpdateResponse{
Expand Down Expand Up @@ -540,7 +540,7 @@ func AccountsUpdate(c web.C, w http.ResponseWriter, r *http.Request) {
err = env.Accounts.UpdateID(session.Owner, user)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Unable to update an account")

utils.JSONResponse(w, 500, &AccountsUpdateResponse{
Expand Down Expand Up @@ -603,7 +603,7 @@ func AccountsDelete(c web.C, w http.ResponseWriter, r *http.Request) {
if err != nil {
env.Log.WithFields(logrus.Fields{
"id": user.ID,
"error": err,
"error": err.Error(),
}).Error("Unable to remove account's tokens")

utils.JSONResponse(w, 500, &AccountsDeleteResponse{
Expand All @@ -617,7 +617,7 @@ func AccountsDelete(c web.C, w http.ResponseWriter, r *http.Request) {
err = env.Accounts.DeleteID(user.ID)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Unable to delete an account")

utils.JSONResponse(w, 500, &AccountsDeleteResponse{
Expand Down Expand Up @@ -662,7 +662,7 @@ func AccountsWipeData(c web.C, w http.ResponseWriter, r *http.Request) {
// The session refers to a non-existing user
env.Log.WithFields(logrus.Fields{
"id": session.ID,
"error": err,
"error": err.Error(),
}).Warn("Valid session referred to a removed account")

utils.JSONResponse(w, 410, &AccountsWipeDataResponse{
Expand All @@ -685,7 +685,7 @@ func AccountsWipeData(c web.C, w http.ResponseWriter, r *http.Request) {
if err != nil {
env.Log.WithFields(logrus.Fields{
"id": user.ID,
"error": err,
"error": err.Error(),
}).Error("Unable to remove account's tokens")

utils.JSONResponse(w, 500, &AccountsWipeDataResponse{
Expand Down
12 changes: 6 additions & 6 deletions routes/attachments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func AttachmentsList(c web.C, w http.ResponseWriter, r *http.Request) {
attachments, err := env.Attachments.GetOwnedBy(session.Owner)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Unable to fetch attachments")

utils.JSONResponse(w, 500, &AttachmentsListResponse{
Expand Down Expand Up @@ -61,7 +61,7 @@ func AttachmentsCreate(c web.C, w http.ResponseWriter, r *http.Request) {
err := utils.ParseRequest(r, &input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to decode a request")

utils.JSONResponse(w, 400, &AttachmentsCreateResponse{
Expand Down Expand Up @@ -105,7 +105,7 @@ func AttachmentsCreate(c web.C, w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Could not insert a attachment into the database")
return
}
Expand Down Expand Up @@ -179,7 +179,7 @@ func AttachmentsUpdate(c web.C, w http.ResponseWriter, r *http.Request) {
err := utils.ParseRequest(r, &input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to decode a request")

utils.JSONResponse(w, 400, &AttachmentsUpdateResponse{
Expand Down Expand Up @@ -239,7 +239,7 @@ func AttachmentsUpdate(c web.C, w http.ResponseWriter, r *http.Request) {
err = env.Attachments.UpdateID(c.URLParams["id"], input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"id": c.URLParams["id"],
}).Error("Unable to update a attachment")

Expand Down Expand Up @@ -291,7 +291,7 @@ func AttachmentsDelete(c web.C, w http.ResponseWriter, r *http.Request) {
err = env.Attachments.DeleteID(c.URLParams["id"])
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"id": c.URLParams["id"],
}).Error("Unable to delete a attachment")

Expand Down
12 changes: 6 additions & 6 deletions routes/contacts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func ContactsList(c web.C, w http.ResponseWriter, r *http.Request) {
contacts, err := env.Contacts.GetOwnedBy(session.Owner)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Unable to fetch contacts")

utils.JSONResponse(w, 500, &ContactsListResponse{
Expand Down Expand Up @@ -67,7 +67,7 @@ func ContactsCreate(c web.C, w http.ResponseWriter, r *http.Request) {
err := utils.ParseRequest(r, &input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to decode a request")

utils.JSONResponse(w, 400, &ContactsCreateResponse{
Expand Down Expand Up @@ -111,7 +111,7 @@ func ContactsCreate(c web.C, w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Could not insert a contact into the database")
return
}
Expand Down Expand Up @@ -185,7 +185,7 @@ func ContactsUpdate(c web.C, w http.ResponseWriter, r *http.Request) {
err := utils.ParseRequest(r, &input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to decode a request")

utils.JSONResponse(w, 400, &ContactsUpdateResponse{
Expand Down Expand Up @@ -245,7 +245,7 @@ func ContactsUpdate(c web.C, w http.ResponseWriter, r *http.Request) {
err = env.Contacts.UpdateID(c.URLParams["id"], input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"id": c.URLParams["id"],
}).Error("Unable to update a contact")

Expand Down Expand Up @@ -297,7 +297,7 @@ func ContactsDelete(c web.C, w http.ResponseWriter, r *http.Request) {
err = env.Contacts.DeleteID(c.URLParams["id"])
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"id": c.URLParams["id"],
}).Error("Unable to delete a contact")

Expand Down
14 changes: 7 additions & 7 deletions routes/emails.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func EmailsList(c web.C, w http.ResponseWriter, r *http.Request) {
l, err := strconv.Atoi(limitRaw)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"limit": limit,
}).Error("Invalid limit")

Expand All @@ -84,7 +84,7 @@ func EmailsList(c web.C, w http.ResponseWriter, r *http.Request) {
emails, err := env.Emails.List(session.Owner, sort, offset, limit, label)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Unable to fetch emails")

utils.JSONResponse(w, 500, &EmailsListResponse{
Expand All @@ -98,7 +98,7 @@ func EmailsList(c web.C, w http.ResponseWriter, r *http.Request) {
count, err := env.Emails.CountOwnedBy(session.Owner)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Unable to count emails")

utils.JSONResponse(w, 500, &EmailsListResponse{
Expand Down Expand Up @@ -152,7 +152,7 @@ func EmailsCreate(c web.C, w http.ResponseWriter, r *http.Request) {
err := utils.ParseRequest(r, &input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to decode a request")

utils.JSONResponse(w, 400, &EmailsCreateResponse{
Expand Down Expand Up @@ -208,7 +208,7 @@ func EmailsCreate(c web.C, w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Could not insert an email into the database")
return
}
Expand All @@ -222,7 +222,7 @@ func EmailsCreate(c web.C, w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Could not publish an email send request")
return
}
Expand Down Expand Up @@ -305,7 +305,7 @@ func EmailsDelete(c web.C, w http.ResponseWriter, r *http.Request) {
err = env.Emails.DeleteID(c.URLParams["id"])
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"id": c.URLParams["id"],
}).Error("Unable to delete a email")

Expand Down
18 changes: 9 additions & 9 deletions routes/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) {
err := utils.ParseRequest(r, &input)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to decode a request")

utils.JSONResponse(w, 409, &KeysCreateResponse{
Expand All @@ -102,7 +102,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"list": entityList,
}).Warn("Cannot parse an armored key")
return
Expand All @@ -117,7 +117,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"list": entityList,
}).Warn("Cannot parse an armored key #2")
return
Expand All @@ -132,7 +132,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"id": session.Owner,
}).Error("Cannot fetch user from database")
return
Expand Down Expand Up @@ -178,7 +178,7 @@ func KeysCreate(c web.C, w http.ResponseWriter, r *http.Request) {
})

env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Error("Could not insert a key to the database")
return
}
Expand Down Expand Up @@ -218,7 +218,7 @@ func KeysGet(c web.C, w http.ResponseWriter, r *http.Request) {
account, err := env.Accounts.FindAccountByName(username)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"name": username,
}).Warn("Unable to fetch the requested account from the database")

Expand All @@ -235,7 +235,7 @@ func KeysGet(c web.C, w http.ResponseWriter, r *http.Request) {
key2, err := env.Keys.FindByFingerprint(account.PGPKey)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to fetch the requested key from the database")

utils.JSONResponse(w, 500, &KeysGetResponse{
Expand All @@ -250,7 +250,7 @@ func KeysGet(c web.C, w http.ResponseWriter, r *http.Request) {
keys, err := env.Keys.FindByOwner(account.ID)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
"owner": account.ID,
}).Warn("Unable to fetch user's keys from the database")

Expand All @@ -277,7 +277,7 @@ func KeysGet(c web.C, w http.ResponseWriter, r *http.Request) {
key2, err := env.Keys.FindByFingerprint(id)
if err != nil {
env.Log.WithFields(logrus.Fields{
"error": err,
"error": err.Error(),
}).Warn("Unable to fetch the requested key from the database")

utils.JSONResponse(w, 404, &KeysGetResponse{
Expand Down
Loading