This commit is contained in:
Christopher Homberger
2026-02-20 21:37:36 +01:00
parent d9948c0df4
commit ae82ca2e97
2 changed files with 20 additions and 13 deletions

View File

@@ -25,6 +25,16 @@ import (
"golang.org/x/term" "golang.org/x/term"
) )
type JobLoggerFactoryWithInfoLevel struct {
}
// WithJobLogger implements [runner.JobLoggerFactory].
func (j *JobLoggerFactoryWithInfoLevel) WithJobLogger() *log.Logger {
jobLogger := log.New()
jobLogger.SetLevel(log.InfoLevel)
return jobLogger
}
type executeArgs struct { type executeArgs struct {
runList bool runList bool
job string job string
@@ -449,10 +459,7 @@ func runExec(ctx context.Context, execArgs *executeArgs) func(cmd *cobra.Command
} }
// TODO GITEA // TODO GITEA
// if !execArgs.debug { ctx = runner.WithJobLoggerFactory(ctx, &JobLoggerFactoryWithInfoLevel{})
// logLevel := log.InfoLevel
// config.JobLoggerLevel = &logLevel
// }
r, err := runner.New(config) r, err := runner.New(config)
if err != nil { if err != nil {

View File

@@ -7,6 +7,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@@ -31,12 +32,17 @@ import (
type JobLoggerFactory struct { type JobLoggerFactory struct {
reporter *report.Reporter reporter *report.Reporter
logToTerminal bool
} }
// WithJobLogger implements [runner.JobLoggerFactory]. // WithJobLogger implements [runner.JobLoggerFactory].
func (j *JobLoggerFactory) WithJobLogger() *log.Logger { func (j *JobLoggerFactory) WithJobLogger() *log.Logger {
jobLogger := logrus.New() jobLogger := logrus.New()
if j.logToTerminal {
jobLogger.SetOutput(os.Stdout) jobLogger.SetOutput(os.Stdout)
} else {
jobLogger.SetOutput(io.Discard)
}
jobLogger.AddHook(j.reporter) jobLogger.AddHook(j.reporter)
return jobLogger return jobLogger
} }
@@ -283,13 +289,7 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report.
reporter.Logf("workflow prepared") reporter.Logf("workflow prepared")
// TODO GITEA // TODO GITEA
// // add logger recorders ctx = runner.WithJobLoggerFactory(ctx, &JobLoggerFactory{reporter: reporter, logToTerminal: log.IsLevelEnabled(log.DebugLevel)})
// ctx = common.WithLoggerHook(ctx, reporter)
ctx = runner.WithJobLoggerFactory(ctx, &JobLoggerFactory{reporter: reporter})
// if !log.IsLevelEnabled(log.DebugLevel) {
// ctx = runner.WithJobLoggerFactory(ctx, NullLogger{})
// }
execErr := executor(ctx) execErr := executor(ctx)
reporter.SetOutputs(job.Outputs) reporter.SetOutputs(job.Outputs)