Stop spurious APIFormat stopwatches logs (go-gitea#20008)

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 <[email protected]>
kitspace · Aug 23, 2022 · e8445d4 · e8445d4
1 parent 59c1583
commit e8445d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/modules/eventsource/manager_run.go b/modules/eventsource/manager_run.go
@@ -94,7 +94,9 @@ loop:
 				for _, userStopwatches := range usersStopwatches {
 					apiSWs, err := convert.ToStopWatches(userStopwatches.StopWatches)
 					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
 					}
 					dataBs, err := json.Marshal(apiSWs)

diff --git a/routers/web/repo/issue_stopwatch.go b/routers/web/repo/issue_stopwatch.go
@@ -99,7 +99,9 @@ func GetActiveStopwatch(ctx *context.Context) {
 
 	issue, err := issues_model.GetIssueByID(ctx, sw.IssueID)
 	if err != nil || issue == nil {
-		ctx.ServerError("GetIssueByID", err)
+		if !issues_model.IsErrIssueNotExist(err) {
+			ctx.ServerError("GetIssueByID", err)
+		}
 		return
 	}
 	if err = issue.LoadRepo(ctx); err != nil {