From ae82ca2e97368f5b341836b2ef89394af7bca2a7 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Fri, 20 Feb 2026 21:37:36 +0100 Subject: [PATCH] adapt --- internal/app/cmd/exec.go | 15 +++++++++++---- internal/app/run/runner.go | 18 +++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/internal/app/cmd/exec.go b/internal/app/cmd/exec.go index ac212a3..c2e9992 100644 --- a/internal/app/cmd/exec.go +++ b/internal/app/cmd/exec.go @@ -25,6 +25,16 @@ import ( "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 { runList bool job string @@ -449,10 +459,7 @@ func runExec(ctx context.Context, execArgs *executeArgs) func(cmd *cobra.Command } // TODO GITEA - // if !execArgs.debug { - // logLevel := log.InfoLevel - // config.JobLoggerLevel = &logLevel - // } + ctx = runner.WithJobLoggerFactory(ctx, &JobLoggerFactoryWithInfoLevel{}) r, err := runner.New(config) if err != nil { diff --git a/internal/app/run/runner.go b/internal/app/run/runner.go index 9d8f246..25c70e2 100644 --- a/internal/app/run/runner.go +++ b/internal/app/run/runner.go @@ -7,6 +7,7 @@ import ( "context" "encoding/json" "fmt" + "io" "os" "path/filepath" "strings" @@ -30,13 +31,18 @@ import ( ) type JobLoggerFactory struct { - reporter *report.Reporter + reporter *report.Reporter + logToTerminal bool } // WithJobLogger implements [runner.JobLoggerFactory]. func (j *JobLoggerFactory) WithJobLogger() *log.Logger { jobLogger := logrus.New() - jobLogger.SetOutput(os.Stdout) + if j.logToTerminal { + jobLogger.SetOutput(os.Stdout) + } else { + jobLogger.SetOutput(io.Discard) + } jobLogger.AddHook(j.reporter) return jobLogger } @@ -283,13 +289,7 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report. reporter.Logf("workflow prepared") // TODO GITEA - // // add logger recorders - // ctx = common.WithLoggerHook(ctx, reporter) - ctx = runner.WithJobLoggerFactory(ctx, &JobLoggerFactory{reporter: reporter}) - - // if !log.IsLevelEnabled(log.DebugLevel) { - // ctx = runner.WithJobLoggerFactory(ctx, NullLogger{}) - // } + ctx = runner.WithJobLoggerFactory(ctx, &JobLoggerFactory{reporter: reporter, logToTerminal: log.IsLevelEnabled(log.DebugLevel)}) execErr := executor(ctx) reporter.SetOutputs(job.Outputs)