fix(api): more info about LoadNodeJobRun (#5186)

yesnault · web-flow · commit d1a3a1809101 · 2020-05-18T12:08:12.000+02:00
diff --git a/engine/api/worker.go b/engine/api/worker.go
@@ -61,7 +61,7 @@ func (api *API) postRegisterWorkerHandler() service.Handler {
 		if workerTokenFromHatchery.Worker.JobID != 0 {
 			job, err := workflow.LoadNodeJobRun(ctx, tx, api.Cache, workerTokenFromHatchery.Worker.JobID)
 			if err != nil {
-				return sdk.NewErrorWithStack(err, sdk.ErrForbidden)
+				return sdk.NewErrorWithStack(sdk.WrapError(err, "error on LoadNodeJobRun with jobID %d", workerTokenFromHatchery.Worker.JobID), sdk.ErrForbidden)
 			}
 			groupIDs = sdk.Groups(job.ExecGroups).ToIDs()
 		} else {
diff --git a/engine/worker/cmd_run.go b/engine/worker/cmd_run.go
@@ -69,6 +69,7 @@ func runCmd() func(cmd *cobra.Command, args []string) {
 			fields := logrus.Fields{}
 			if isErrWithStack {
 				fields["stack_trace"] = fmt.Sprintf("%+v", err)
+				fields["request_id"] = sdk.ExtractHTTPError(err, "").RequestID
 			}
 			log.ErrorWithFields(ctx, fields, "%v", err)
 			time.Sleep(2 * time.Second)

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func (api *API) postRegisterWorkerHandler() service.Handler {`
`61`	`61`	`if workerTokenFromHatchery.Worker.JobID != 0 {`
`62`	`62`	`job, err := workflow.LoadNodeJobRun(ctx, tx, api.Cache, workerTokenFromHatchery.Worker.JobID)`
`63`	`63`	`if err != nil {`
`64`		`- return sdk.NewErrorWithStack(err, sdk.ErrForbidden)`
	`64`	`+ return sdk.NewErrorWithStack(sdk.WrapError(err, "error on LoadNodeJobRun with jobID %d", workerTokenFromHatchery.Worker.JobID), sdk.ErrForbidden)`
`65`	`65`	`}`
`66`	`66`	`groupIDs = sdk.Groups(job.ExecGroups).ToIDs()`
`67`	`67`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ func runCmd() func(cmd *cobra.Command, args []string) {`
`69`	`69`	`fields := logrus.Fields{}`
`70`	`70`	`if isErrWithStack {`
`71`	`71`	`fields["stack_trace"] = fmt.Sprintf("%+v", err)`
	`72`	`+ fields["request_id"] = sdk.ExtractHTTPError(err, "").RequestID`
`72`	`73`	`}`
`73`	`74`	`log.ErrorWithFields(ctx, fields, "%v", err)`
`74`	`75`	`time.Sleep(2 * time.Second)`