mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-06-29 23:55:26 +00:00
8f72c60afa
Fixes https://gitea.com/gitea/runner/issues/1047 The runner panics during shutdown when jobs are interrupted: ``` panic in executor: interface conversion: interface {} is nil, not map[string]error ... gitea.com/gitea/runner/act/common.SetJobError(...) /data/gitea/runner/act/common/job_error.go:27 gitea.com/gitea/runner/act/runner.reportStepError(...) /data/gitea/runner/act/runner/job_executor.go:62 ``` `SetJobError` did an unchecked type assertion on the job-error container stored in the context: ```go ctx.Value(jobErrorContextKeyVal).(map[string]error)["error"] = err ``` When the container is absent — e.g. on shutdown, when a job is interrupted and `reportStepError` → `SetJobError` runs on a context where `WithJobErrorContainer` was never called — `ctx.Value` returns `nil` and asserting `nil.(map[string]error)` panics. ## Fix Use the comma-ok form so a missing container is a no-op, matching the safe pattern already used in the sibling `JobError` function. If there's no container, there's nowhere to record the error anyway, so skipping is correct. ```go func SetJobError(ctx context.Context, err error) { if container, ok := ctx.Value(jobErrorContextKeyVal).(map[string]error); ok { container["error"] = err } } ``` Reviewed-on: https://gitea.com/gitea/runner/pulls/1050 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: bircni <bircni@icloud.com> Co-committed-by: bircni <bircni@icloud.com>
37 lines
962 B
Go
37 lines
962 B
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// Copyright 2021 The nektos/act Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package common
|
|
|
|
import (
|
|
"context"
|
|
)
|
|
|
|
type jobErrorContextKey string
|
|
|
|
const jobErrorContextKeyVal = jobErrorContextKey("job.error")
|
|
|
|
// JobError returns the job error for current context if any
|
|
func JobError(ctx context.Context) error {
|
|
val := ctx.Value(jobErrorContextKeyVal)
|
|
if val != nil {
|
|
if container, ok := val.(map[string]error); ok {
|
|
return container["error"]
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func SetJobError(ctx context.Context, err error) {
|
|
if container, ok := ctx.Value(jobErrorContextKeyVal).(map[string]error); ok {
|
|
container["error"] = err
|
|
}
|
|
}
|
|
|
|
// WithJobErrorContainer adds a value to the context as a container for an error
|
|
func WithJobErrorContainer(ctx context.Context) context.Context {
|
|
container := map[string]error{}
|
|
return context.WithValue(ctx, jobErrorContextKeyVal, container)
|
|
}
|