potyarkin/forgejo-runner-act
1
0
Fork 0
Code Issues Pull requests Activity

feat: allow existing logger from context (#859)

Browse source 
We should reuse an existing context logger if available.
This will allow test to setup act with a null logger to assert
log messages.

Co-authored-by: Björn Brauer <bjoern.brauer@new-work.se>

Co-authored-by: Björn Brauer <bjoern.brauer@new-work.se>
This commit is contained in:
Markus Wolf 2021-11-13 00:20:45 +01:00 • committed by GitHub
parent cd24df5727
commit 603cf56878
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/runner/logger.go
View file

@ -47,7 +47,14 @@ func WithJobLogger(ctx context.Context, jobName string, secrets map[string]strin
formatter.insecureSecrets = insecureSecrets formatter.insecureSecrets = insecureSecrets
nextColor++ nextColor++
logger := logrus.New() var logger *logrus.Logger
fieldLogger := common.Logger(ctx)
if fieldLogger != nil {
logger = fieldLogger.(*logrus.Logger)
}
if logger == nil {
logger = logrus.New()
}
logger.SetFormatter(formatter) logger.SetFormatter(formatter)
logger.SetOutput(os.Stdout) logger.SetOutput(os.Stdout)
logger.SetLevel(logrus.GetLevel()) logger.SetLevel(logrus.GetLevel())