Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Stop spurious APIFormat stopwatches logs (#20008)

Browse source 
If there are dangling stopwatches with missing issues there will be repeated
logging of Unable to APIFormat stopwatches. These are unhelpful and instead
we should only log if the error is not an issue not exist error.

And we should also prevent an error on missing issue in GetActiveStopwatch too

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2022-06-17 22:47:15 +01:00 committed by GitHub
parent 5d80feb5a6
commit ae446b13f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/eventsource/manager_run.go
View file

@ -94,7 +94,9 @@ loop:
for _, userStopwatches := range usersStopwatches { for _, userStopwatches := range usersStopwatches {
apiSWs, err := convert.ToStopWatches(userStopwatches.StopWatches) apiSWs, err := convert.ToStopWatches(userStopwatches.StopWatches)
if err != nil { if err != nil {
log.Error("Unable to APIFormat stopwatches: %v", err) if !issues_model.IsErrIssueNotExist(err) {
log.Error("Unable to APIFormat stopwatches: %v", err)
}
continue continue
} }
dataBs, err := json.Marshal(apiSWs) dataBs, err := json.Marshal(apiSWs)

4
routers/web/repo/issue_stopwatch.go
View file

@ -99,7 +99,9 @@ func GetActiveStopwatch(ctx *context.Context) {
issue, err := issues_model.GetIssueByID(ctx, sw.IssueID) issue, err := issues_model.GetIssueByID(ctx, sw.IssueID)
if err != nil || issue == nil { if err != nil || issue == nil {
ctx.ServerError("GetIssueByID", err) if !issues_model.IsErrIssueNotExist(err) {
ctx.ServerError("GetIssueByID", err)
}
return return
} }
if err = issue.LoadRepo(ctx); err != nil { if err = issue.LoadRepo(ctx); err != nil {