vfs/party
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better logging

Browse Source
This commit is contained in:
Vicente Ferrari Smith 2026-05-20 07:22:08 +02:00
parent 4855255373
commit 65326b0ff5
13 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
cmd/party/api/api.go
View File

@ -44,7 +44,7 @@ func (api *Api) Authenticate(next http.Handler) http.Handler {
case errors.Is(err, data.ErrRecordNotFound): case errors.Is(err, data.ErrRecordNotFound):
api.errorResponse(w, r, data.ErrInvalidAuthToken) api.errorResponse(w, r, data.ErrInvalidAuthToken)
default: default:
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
return return
} }
@ -55,7 +55,7 @@ func (api *Api) Authenticate(next http.Handler) http.Handler {
case errors.Is(err, data.ErrRecordNotFound): case errors.Is(err, data.ErrRecordNotFound):
api.errorResponse(w, r, data.ErrInvalidCredentials) api.errorResponse(w, r, data.ErrInvalidCredentials)
default: default:
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
return return
} }

6
cmd/party/api/device_tokens.go
View File

@ -38,7 +38,7 @@ func (api *Api) RegisterDeviceToken(w http.ResponseWriter, r *http.Request) {
api.App.Logger.PrintError(err, map[string]string{ api.App.Logger.PrintError(err, map[string]string{
"user_id": fmt.Sprint(user.ID), "user_id": fmt.Sprint(user.ID),
}) })
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
@ -65,7 +65,7 @@ func (api *Api) DeleteDeviceToken(w http.ResponseWriter, r *http.Request) {
tokens, err := api.App.Models.DeviceTokens.GetForUser(user.ID) tokens, err := api.App.Models.DeviceTokens.GetForUser(user.ID)
if err != nil { if err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
owns := false owns := false
@ -81,7 +81,7 @@ func (api *Api) DeleteDeviceToken(w http.ResponseWriter, r *http.Request) {
} }
if err := api.App.Models.DeviceTokens.Delete(input.Token); err != nil { if err := api.App.Models.DeviceTokens.Delete(input.Token); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }

9
cmd/party/api/errors.go
View File

@ -16,12 +16,13 @@ func (api *Api) LogError(r *http.Request, err error) {
} }
func (api *Api) errorResponse(w http.ResponseWriter, r *http.Request, err error) { func (api *Api) errorResponse(w http.ResponseWriter, r *http.Request, err error) {
api.App.LogError(r, err)
apiErr := &data.Error{ apiErr := &data.Error{
HttpCode: http.StatusInternalServerError, HttpCode: http.StatusInternalServerError,
Message: "the server encountered a problem", Message: "the server encountered a problem",
} }
// Try to "unbox" the error to see if it's our rich *Error type
var customErr *data.Error var customErr *data.Error
if errors.As(err, &customErr) { if errors.As(err, &customErr) {
apiErr = customErr apiErr = customErr
@ -32,9 +33,3 @@ func (api *Api) errorResponse(w http.ResponseWriter, r *http.Request, err error)
w.WriteHeader(500) w.WriteHeader(500)
} }
} }
func (api *Api) ServerErrorResponse(w http.ResponseWriter, r *http.Request, err error) {
api.App.LogError(r, err)
api.errorResponse(w, r, err)
}

2
cmd/party/api/healthcheck.go
View File

@ -15,6 +15,6 @@ func (api *Api) Healthcheck(w http.ResponseWriter, r *http.Request) {
} }
if err := common.WriteJSON(w, http.StatusOK, common.Envelope{"health_check": env}, nil); err != nil { if err := common.WriteJSON(w, http.StatusOK, common.Envelope{"health_check": env}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }

22
cmd/party/api/issues.go
View File

@ -33,12 +33,12 @@ func (api *Api) ListIssues(w http.ResponseWriter, r *http.Request) {
issues, metadata, err := api.App.FetchIssues(input.Title, input.Filters, common.GetUser(r)) issues, metadata, err := api.App.FetchIssues(input.Title, input.Filters, common.GetUser(r))
if err != nil { if err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"issues": issues, "metadata": metadata}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"issues": issues, "metadata": metadata}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -65,7 +65,7 @@ func (api *Api) CreateIssue(w http.ResponseWriter, r *http.Request) {
headers := make(http.Header) headers := make(http.Header)
headers.Set("Location", fmt.Sprintf("/v1/issues/%d", issue.ID)) headers.Set("Location", fmt.Sprintf("/v1/issues/%d", issue.ID))
if err = common.WriteJSON(w, http.StatusCreated, common.Envelope{"issue": issue, "options": options}, headers); err != nil { if err = common.WriteJSON(w, http.StatusCreated, common.Envelope{"issue": issue, "options": options}, headers); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -81,13 +81,13 @@ func (api *Api) ReadIssue(w http.ResponseWriter, r *http.Request) {
if errors.Is(err, data.ErrRecordNotFound) { if errors.Is(err, data.ErrRecordNotFound) {
api.errorResponse(w, r, data.ErrRecordNotFound) api.errorResponse(w, r, data.ErrRecordNotFound)
} else { } else {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
return return
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"issue": result.IssueDetail, "options": result.Options}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"issue": result.IssueDetail, "options": result.Options}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -117,7 +117,7 @@ func (api *Api) UpdateIssue(w http.ResponseWriter, r *http.Request) {
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"issue": issue}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"issue": issue}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -132,13 +132,13 @@ func (api *Api) DeleteIssue(w http.ResponseWriter, r *http.Request) {
if errors.Is(err, data.ErrRecordNotFound) { if errors.Is(err, data.ErrRecordNotFound) {
api.errorResponse(w, r, data.ErrRecordNotFound) api.errorResponse(w, r, data.ErrRecordNotFound)
} else { } else {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
return return
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"message": "issue successfully deleted"}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"message": "issue successfully deleted"}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -154,13 +154,13 @@ func (api *Api) ReadIssuePubKey(w http.ResponseWriter, r *http.Request) {
if errors.Is(err, data.ErrRecordNotFound) { if errors.Is(err, data.ErrRecordNotFound) {
api.errorResponse(w, r, data.ErrRecordNotFound) api.errorResponse(w, r, data.ErrRecordNotFound)
} else { } else {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
return return
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"public_key": pubKey}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"public_key": pubKey}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -186,6 +186,6 @@ func (api *Api) BlindSignIssueVote(w http.ResponseWriter, r *http.Request) {
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"signed": signed}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"signed": signed}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }

6
cmd/party/api/middleware.go
View File

@ -17,7 +17,7 @@ func (api *Api) RecoverPanic(next http.Handler) http.Handler {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
w.Header().Set("Connection", "close") w.Header().Set("Connection", "close")
api.ServerErrorResponse(w, r, fmt.Errorf("%s", err)) api.errorResponse(w, r, fmt.Errorf("%s", err))
} }
}() }()
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
@ -49,7 +49,7 @@ func (api *Api) RequirePermission(code string, next http.HandlerFunc) http.Handl
fn := func(w http.ResponseWriter, r *http.Request) { fn := func(w http.ResponseWriter, r *http.Request) {
permissions, err := api.App.Models.Permissions.GetAllForUser(common.GetUser(r).ID) permissions, err := api.App.Models.Permissions.GetAllForUser(common.GetUser(r).ID)
if err != nil { if err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
if !permissions.Include(code) { if !permissions.Include(code) {
@ -87,7 +87,7 @@ func (api *Api) RateLimit(next http.Handler) http.Handler {
if api.App.LimiterEnabled { if api.App.LimiterEnabled {
ip, _, err := net.SplitHostPort(r.RemoteAddr) ip, _, err := net.SplitHostPort(r.RemoteAddr)
if err != nil { if err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }

4
cmd/party/api/mps.go
View File

@ -10,7 +10,7 @@ import (
func (api *Api) ListMPs(w http.ResponseWriter, r *http.Request) { func (api *Api) ListMPs(w http.ResponseWriter, r *http.Request) {
members, err := api.App.Parlament.ListNRMembers("XXVIII") members, err := api.App.Parlament.ListNRMembers("XXVIII")
if err != nil { if err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
@ -25,6 +25,6 @@ func (api *Api) ListMPs(w http.ResponseWriter, r *http.Request) {
"members": members, "members": members,
"total": len(members), "total": len(members),
}, nil); err != nil { }, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }

4
cmd/party/api/parlvotedetail.go
View File

@ -21,7 +21,7 @@ func (api *Api) GetParlVoteDetail(w http.ResponseWriter, r *http.Request) {
detail, err := api.App.Parlament.GetDocumentVote(path) detail, err := api.App.Parlament.GetDocumentVote(path)
if err != nil { if err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
if detail == nil { if detail == nil {
@ -30,6 +30,6 @@ func (api *Api) GetParlVoteDetail(w http.ResponseWriter, r *http.Request) {
} }
if err := common.WriteJSON(w, http.StatusOK, common.Envelope{"vote": detail}, nil); err != nil { if err := common.WriteJSON(w, http.StatusOK, common.Envelope{"vote": detail}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }

4
cmd/party/api/parlvotes.go
View File

@ -33,7 +33,7 @@ func (api *Api) ListParlVotes(w http.ResponseWriter, r *http.Request) {
Period: []string{parlament.CurrentPeriod}, Period: []string{parlament.CurrentPeriod},
}) })
if err != nil { if err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
@ -102,7 +102,7 @@ func (api *Api) ListParlVotes(w http.ResponseWriter, r *http.Request) {
"total_with_votes": totalWithVotes, "total_with_votes": totalWithVotes,
"party_stats": partyStats, "party_stats": partyStats,
}, nil); err != nil { }, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }

8
cmd/party/api/tokens.go
View File

@ -35,13 +35,13 @@ func (api *Api) CreateAuthenticationToken(w http.ResponseWriter, r *http.Request
case errors.Is(err, data.ErrInvalidCredentials): case errors.Is(err, data.ErrInvalidCredentials):
api.errorResponse(w, r, data.ErrInvalidCredentials) api.errorResponse(w, r, data.ErrInvalidCredentials)
default: default:
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
return return
} }
if err = common.WriteJSON(w, http.StatusCreated, common.Envelope{"authentication_token": token}, nil); err != nil { if err = common.WriteJSON(w, http.StatusCreated, common.Envelope{"authentication_token": token}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -61,11 +61,11 @@ func (api *Api) DeleteAuthenticationToken(w http.ResponseWriter, r *http.Request
} }
if err := api.App.DeleteToken(token); err != nil { if err := api.App.DeleteToken(token); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
if err := common.WriteJSON(w, http.StatusOK, common.Envelope{"message": "authentication token successfully deleted"}, nil); err != nil { if err := common.WriteJSON(w, http.StatusOK, common.Envelope{"message": "authentication token successfully deleted"}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }

18
cmd/party/api/users.go
View File

@ -30,12 +30,12 @@ func (api *Api) ListUsers(w http.ResponseWriter, r *http.Request) {
users, metadata, err := api.App.ListUsers(input.Filters) users, metadata, err := api.App.ListUsers(input.Filters)
if err != nil { if err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"users": users, "metadata": metadata}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"users": users, "metadata": metadata}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -54,7 +54,7 @@ func (api *Api) CreateUser(w http.ResponseWriter, r *http.Request) {
} }
if err = common.WriteJSON(w, http.StatusCreated, common.Envelope{"user": user, "authentication_token": authToken}, nil); err != nil { if err = common.WriteJSON(w, http.StatusCreated, common.Envelope{"user": user, "authentication_token": authToken}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -80,13 +80,13 @@ func (api *Api) ReadUser(w http.ResponseWriter, r *http.Request) {
if errors.Is(err, data.ErrRecordNotFound) { if errors.Is(err, data.ErrRecordNotFound) {
api.errorResponse(w, r, data.ErrRecordNotFound) api.errorResponse(w, r, data.ErrRecordNotFound)
} else { } else {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
return return
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"user": target}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"user": target}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -94,7 +94,7 @@ func (api *Api) ReadUser(w http.ResponseWriter, r *http.Request) {
// user := common.GetUser(r).ID // user := common.GetUser(r).ID
// if err := common.WriteJSON(w, http.StatusOK, common.Envelope{"user": user}, nil); err != nil { // if err := common.WriteJSON(w, http.StatusOK, common.Envelope{"user": user}, nil); err != nil {
// api.ServerErrorResponse(w, r, err) // api.errorResponse(w, r, err)
// } // }
// } // }
@ -109,13 +109,13 @@ func (api *Api) DeleteUser(w http.ResponseWriter, r *http.Request) {
if errors.Is(err, data.ErrRecordNotFound) { if errors.Is(err, data.ErrRecordNotFound) {
api.errorResponse(w, r, data.ErrRecordNotFound) api.errorResponse(w, r, data.ErrRecordNotFound)
} else { } else {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
return return
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"message": "user successfully deleted"}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"message": "user successfully deleted"}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }
@ -142,6 +142,6 @@ func (api *Api) ActivateUser(w http.ResponseWriter, r *http.Request) {
} }
if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"user": user}, nil); err != nil { if err = common.WriteJSON(w, http.StatusOK, common.Envelope{"user": user}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }

4
cmd/party/api/votes.go
View File

@ -26,12 +26,12 @@ func (api *Api) Vote(w http.ResponseWriter, r *http.Request) {
} }
if err := api.App.CastVote(input.IssueID, input.OptionID, input.Nonce, input.Signature); err != nil { if err := api.App.CastVote(input.IssueID, input.OptionID, input.Nonce, input.Signature); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
return return
} }
if err := common.WriteJSON(w, http.StatusCreated, common.Envelope{"message": "vote successfully cast"}, nil); err != nil { if err := common.WriteJSON(w, http.StatusCreated, common.Envelope{"message": "vote successfully cast"}, nil); err != nil {
api.ServerErrorResponse(w, r, err) api.errorResponse(w, r, err)
} }
} }