actions/act_runner
1
0
Fork 1
mirror of https://gitea.com/gitea/act_runner.git synced 2026-02-21 14:06:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

adapt

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/app/cmd/exec.go
View File

@ -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 {

18
internal/app/run/runner.go
View File

@ -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)