From 5efaf6d9f5fe5ccf3b8ac3630d779abf87d8df3c Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Fri, 8 Dec 2023 10:09:48 +0100 Subject: [PATCH] added extra OUTPUT level Signed-off-by: Christian Goll --- CHANGELOG.md | 2 +- internal/pkg/wwlog/wwlog.go | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16b56677..08461b73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -125,7 +125,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Support importing containers with symlinked `/bin/sh` #797 - Don't panic on malformed passwd #527 - Update iPXE building script -- wwlog.Info|Recv|Send will go to stdout, rest to stderr +- Send Info, Recv, Send, and Out messages to stdout; and others to stderr ## [4.4.0] 2023-01-18 diff --git a/internal/pkg/wwlog/wwlog.go b/internal/pkg/wwlog/wwlog.go index e4d6d9e3..0b8ee5ca 100644 --- a/internal/pkg/wwlog/wwlog.go +++ b/internal/pkg/wwlog/wwlog.go @@ -36,9 +36,11 @@ var ( ERROR = SetLevelName(40, "ERROR") SECWARN = SetLevelName(31, "SECWARN") WARN = SetLevelName(30, "WARN") + ERROUT = SetLevelName(29, "ERROUT") SEND = SetLevelName(27, "SEND") RECV = SetLevelName(26, "RECV") SERV = SetLevelName(25, "SERV") + OUT = SetLevelName(22, "OUT") SECINFO = SetLevelName(21, "SECINFO") INFO = SetLevelName(20, "INFO") SECVERBOSE = SetLevelName(16, "SECVERBOSE") @@ -216,7 +218,7 @@ func LogCaller(level int, skip int, err error, message string, a ...interface{}) } message = logFormatter(logLevel, &rec) - if level == INFO || level == RECV || level == SEND { + if level == INFO || level == RECV || level == SEND || level == OUT { fmt.Fprint(logOut, message) } else { fmt.Fprint(logErr, message) @@ -273,6 +275,10 @@ func Info(message string, a ...interface{}) { LogCaller(INFO, 1, nil, message, a...) } +func Output(message string, a ...interface{}) { + LogCaller(OUT, 1, nil, message, a...) +} + func InfoExc(err error, message string, a ...interface{}) { LogCaller(INFO, 1, err, message, a...) } @@ -305,6 +311,10 @@ func SecWarn(message string, a ...interface{}) { LogCaller(SECWARN, 1, nil, message, a...) } +func ErrOut(message string, a ...interface{}) { + LogCaller(ERROUT, 1, nil, message, a...) +} + func Error(message string, a ...interface{}) { LogCaller(ERROR, 1, nil, message, a...) }