migrate to WithJobLoggerFactory

This commit is contained in:
Christopher Homberger
2026-02-20 14:17:04 +01:00
parent 35df5a61e4
commit 17bc93f003

View File

@@ -6,6 +6,7 @@ package run
import ( import (
"context" "context"
"fmt" "fmt"
"os"
"path/filepath" "path/filepath"
"strings" "strings"
"sync" "sync"
@@ -16,6 +17,7 @@ import (
"github.com/actions-oss/act-cli/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/actions-oss/act-cli/pkg/runner" "github.com/actions-oss/act-cli/pkg/runner"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"gitea.com/gitea/act_runner/internal/pkg/client" "gitea.com/gitea/act_runner/internal/pkg/client"
@@ -25,6 +27,18 @@ import (
"gitea.com/gitea/act_runner/internal/pkg/ver" "gitea.com/gitea/act_runner/internal/pkg/ver"
) )
type JobLoggerFactory struct {
reporter *report.Reporter
}
// WithJobLogger implements [runner.JobLoggerFactory].
func (j *JobLoggerFactory) WithJobLogger() *log.Logger {
jobLogger := logrus.New()
jobLogger.SetOutput(os.Stdout)
jobLogger.AddHook(j.reporter)
return jobLogger
}
// Runner runs the pipeline. // Runner runs the pipeline.
type Runner struct { type Runner struct {
name string name string
@@ -244,6 +258,7 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report.
// TODO GITEA // TODO GITEA
// // add logger recorders // // add logger recorders
// ctx = common.WithLoggerHook(ctx, reporter) // ctx = common.WithLoggerHook(ctx, reporter)
ctx = runner.WithJobLoggerFactory(ctx, &JobLoggerFactory{reporter: reporter})
if !log.IsLevelEnabled(log.DebugLevel) { if !log.IsLevelEnabled(log.DebugLevel) {
ctx = runner.WithJobLoggerFactory(ctx, NullLogger{}) ctx = runner.WithJobLoggerFactory(ctx, NullLogger{})