Skip to content

Commit 75a1ae6

Browse files
committed
Log the underlying panic in runMigrateTask (go-gitea#13096)
If there is a panic during runMigrateTask we should capture and log the underlying panic error. This PR ensures that the panic is logged and captured as part of the task message. Fix go-gitea#13095 Signed-off-by: Andrew Thornton <[email protected]>
1 parent 170b57f commit 75a1ae6

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

modules/task/migrate.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package task
66

77
import (
8-
"bytes"
98
"errors"
109
"fmt"
1110
"strings"
@@ -39,10 +38,8 @@ func handleCreateError(owner *models.User, err error, name string) error {
3938
func runMigrateTask(t *models.Task) (err error) {
4039
defer func() {
4140
if e := recover(); e != nil {
42-
var buf bytes.Buffer
43-
fmt.Fprintf(&buf, "Handler crashed with error: %v", log.Stack(2))
44-
45-
err = errors.New(buf.String())
41+
err = fmt.Errorf("PANIC whilst trying to do migrate task: %v\nStacktrace: %v", err, log.Stack(2))
42+
log.Critical("PANIC during runMigrateTask[%d] by DoerID[%d] to RepoID[%d] for OwnerID[%d]: %v", t.ID, t.DoerID, t.RepoID, t.OwnerID, err)
4643
}
4744

4845
if err == nil {
@@ -52,14 +49,14 @@ func runMigrateTask(t *models.Task) (err error) {
5249
return
5350
}
5451

55-
log.Error("FinishMigrateTask failed: %s", err.Error())
52+
log.Error("FinishMigrateTask[%d] by DoerID[%d] to RepoID[%d] for OwnerID[%d] failed: %v", t.ID, t.DoerID, t.RepoID, t.OwnerID, err)
5653
}
5754

5855
t.EndTime = timeutil.TimeStampNow()
5956
t.Status = structs.TaskStatusFailed
6057
t.Errors = err.Error()
6158
if err := t.UpdateCols("status", "errors", "end_time"); err != nil {
62-
log.Error("Task UpdateCols failed: %s", err.Error())
59+
log.Error("Task UpdateCols failed: %v", err)
6360
}
6461

6562
if t.Repo != nil {

0 commit comments

Comments
 (0)