Merge pull request '[GITEA] Actually recover from a panic in cron task' (#1912) from forgejo-bp-1911 into v1.21/forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1912

services/cron/tasks.go

@@ -84,13 +84,15 @@ func (t *Task) RunWithUser(doer *user_model.User, config Config) {
 	t.lock.Unlock()
 	defer func() {
 		taskStatusTable.Stop(t.Name)
+	}()
+	graceful.GetManager().RunWithShutdownContext(func(baseCtx context.Context) {
+		defer func() {
 			if err := recover(); err != nil {
-			// Recover a panic within the
+				// Recover a panic within the execution of the task.
 				combinedErr := fmt.Errorf("%s\n%s", err, log.Stack(2))
 				log.Error("PANIC whilst running task: %s Value: %v", t.Name, combinedErr)
 			}
 		}()
-	graceful.GetManager().RunWithShutdownContext(func(baseCtx context.Context) {
 		// Store the time of this run, before the function is executed, so it
 		// matches the behavior of what the cron library does.
 		t.lock.Lock()