All checks were successful
check / check (push) Successful in 53s
- Add canonical .golangci.yml (v2 schema, default: all, project thresholds for lll/funlen/cyclop/dupl) - Bump golangci-lint pins from v2.0.2 to v2.12.2 in Makefile (go install, new /v2 module path) and Dockerfile (tagged+digest Debian image pin) - Fix all lint findings surfaced by the new linter set across cmd/mfer, internal/bork, internal/cli, internal/log, and mfer: static sentinel errors (err113), context-aware HTTP and exec (noctx), guarded integer conversions and stricter permissions (gosec), named constants (mnd, goconst), function decomposition (funlen, cyclop, gocognit, nestif), declaration ordering (funcorder), t.Parallel/t.TempDir/t.Setenv adoption in tests (paralleltest, usetesting), protobuf getters (protogetter), plus formatting and style cleanups (wsl_v5, nlreturn, lll, revive, testifylint, and others) - Serialize CLI runs in tests behind a mutex so parallel tests do not cross-wire the process-global logger's captured output The decompositions are behavior-preserving. In particular: - REPO_POLICIES.md is untouched and stays byte-identical to the authoritative copy in the prompts repo - the mfer.manifest type stays unexported; whether to export it is an open owner design question (README question 13) - directories created by fetch keep mode 0755, because fetched trees are content meant to be readable by other uids - an absent MFFilePath.Mtime is handled explicitly and identically in freshen, list, and export rather than being read as the Unix epoch, which would classify every entry as changed and rewrite the manifest on every freshen - every user-visible error message renders byte-identically to what it did before, with the err113 sentinels wrapped mid-sentence where needed; the rendered strings are now pinned by tests Also fixes an argument-injection defect the lint pass surfaced: key IDs reach gpg as bare positional arguments, so a key ID beginning with "-" was parsed by gpg as an option. All positional arguments now follow an explicit "--" end-of-options marker. The symlink-escape gap in fetch's path handling, which sanitizePath does not and cannot address, is filed separately as #86.
294 lines
6.2 KiB
Go
294 lines
6.2 KiB
Go
// Package log provides leveled logging with progress output helpers
|
|
// on top of apex/log and pterm.
|
|
package log
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"runtime"
|
|
"sync"
|
|
|
|
"github.com/apex/log"
|
|
acli "github.com/apex/log/handlers/cli"
|
|
"github.com/davecgh/go-spew/spew"
|
|
"github.com/pterm/pterm"
|
|
)
|
|
|
|
// Level represents log severity levels.
|
|
// Lower values are more verbose.
|
|
type Level int
|
|
|
|
const (
|
|
// DebugLevel is for low-level tracing and structure inspection
|
|
DebugLevel Level = iota
|
|
// VerboseLevel is for detailed operational info (file listings, etc)
|
|
VerboseLevel
|
|
// InfoLevel is for operational summaries (default)
|
|
InfoLevel
|
|
// WarnLevel is for warnings
|
|
WarnLevel
|
|
// ErrorLevel is for errors
|
|
ErrorLevel
|
|
// FatalLevel is for fatal errors
|
|
FatalLevel
|
|
)
|
|
|
|
func (l Level) String() string {
|
|
switch l {
|
|
case DebugLevel:
|
|
return "debug"
|
|
case VerboseLevel:
|
|
return "verbose"
|
|
case InfoLevel:
|
|
return "info"
|
|
case WarnLevel:
|
|
return "warn"
|
|
case ErrorLevel:
|
|
return "error"
|
|
case FatalLevel:
|
|
return "fatal"
|
|
default:
|
|
return "unknown"
|
|
}
|
|
}
|
|
|
|
// callerSkip is the runtime.Caller stack depth from the public Debug
|
|
// helpers to the caller of the log package.
|
|
const callerSkip = 2
|
|
|
|
//nolint:gochecknoglobals // package-level logger state by design
|
|
var (
|
|
// mu protects the output writers and level
|
|
mu sync.RWMutex
|
|
// stdout is the writer for progress output
|
|
stdout io.Writer = os.Stdout
|
|
// stderr is the writer for log output
|
|
stderr io.Writer = os.Stderr
|
|
// currentLevel is our log level (includes Verbose)
|
|
currentLevel = InfoLevel
|
|
)
|
|
|
|
// SetOutput configures the output writers for the log package.
|
|
// stdout is used for progress output, stderr is used for log messages.
|
|
func SetOutput(out, err io.Writer) {
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
|
|
stdout = out
|
|
stderr = err
|
|
|
|
pterm.SetDefaultOutput(out)
|
|
}
|
|
|
|
// GetStdout returns the configured stdout writer.
|
|
func GetStdout() io.Writer {
|
|
mu.RLock()
|
|
defer mu.RUnlock()
|
|
|
|
return stdout
|
|
}
|
|
|
|
// GetStderr returns the configured stderr writer.
|
|
func GetStderr() io.Writer {
|
|
mu.RLock()
|
|
defer mu.RUnlock()
|
|
|
|
return stderr
|
|
}
|
|
|
|
// DisableStyling turns off colors and styling for terminal output.
|
|
func DisableStyling() {
|
|
pterm.DisableColor()
|
|
pterm.DisableStyling()
|
|
|
|
pterm.Debug.Prefix.Text = ""
|
|
pterm.Info.Prefix.Text = ""
|
|
pterm.Success.Prefix.Text = ""
|
|
pterm.Warning.Prefix.Text = ""
|
|
pterm.Error.Prefix.Text = ""
|
|
pterm.Fatal.Prefix.Text = ""
|
|
}
|
|
|
|
// Init initializes the logger with the CLI handler and default log level.
|
|
func Init() {
|
|
mu.RLock()
|
|
|
|
w := stderr
|
|
|
|
mu.RUnlock()
|
|
log.SetHandler(acli.New(w))
|
|
log.SetLevel(log.DebugLevel) // Let apex/log pass everything; we filter ourselves
|
|
}
|
|
|
|
// isEnabled returns true if messages at the given level should be logged.
|
|
func isEnabled(l Level) bool {
|
|
mu.RLock()
|
|
defer mu.RUnlock()
|
|
|
|
return l >= currentLevel
|
|
}
|
|
|
|
// Fatalf logs a formatted message at fatal level.
|
|
func Fatalf(format string, args ...any) {
|
|
if isEnabled(FatalLevel) {
|
|
log.Fatalf(format, args...)
|
|
}
|
|
}
|
|
|
|
// Fatal logs a message at fatal level.
|
|
func Fatal(arg string) {
|
|
if isEnabled(FatalLevel) {
|
|
log.Fatal(arg)
|
|
}
|
|
}
|
|
|
|
// Errorf logs a formatted message at error level.
|
|
func Errorf(format string, args ...any) {
|
|
if isEnabled(ErrorLevel) {
|
|
log.Errorf(format, args...)
|
|
}
|
|
}
|
|
|
|
// Error logs a message at error level.
|
|
func Error(arg string) {
|
|
if isEnabled(ErrorLevel) {
|
|
log.Error(arg)
|
|
}
|
|
}
|
|
|
|
// Warnf logs a formatted message at warn level.
|
|
func Warnf(format string, args ...any) {
|
|
if isEnabled(WarnLevel) {
|
|
log.Warnf(format, args...)
|
|
}
|
|
}
|
|
|
|
// Warn logs a message at warn level.
|
|
func Warn(arg string) {
|
|
if isEnabled(WarnLevel) {
|
|
log.Warn(arg)
|
|
}
|
|
}
|
|
|
|
// Infof logs a formatted message at info level.
|
|
func Infof(format string, args ...any) {
|
|
if isEnabled(InfoLevel) {
|
|
log.Infof(format, args...)
|
|
}
|
|
}
|
|
|
|
// Info logs a message at info level.
|
|
func Info(arg string) {
|
|
if isEnabled(InfoLevel) {
|
|
log.Info(arg)
|
|
}
|
|
}
|
|
|
|
// Verbosef logs a formatted message at verbose level.
|
|
func Verbosef(format string, args ...any) {
|
|
if isEnabled(VerboseLevel) {
|
|
log.Infof(format, args...)
|
|
}
|
|
}
|
|
|
|
// Verbose logs a message at verbose level.
|
|
func Verbose(arg string) {
|
|
if isEnabled(VerboseLevel) {
|
|
log.Info(arg)
|
|
}
|
|
}
|
|
|
|
// Debugf logs a formatted message at debug level with caller location.
|
|
func Debugf(format string, args ...any) {
|
|
if isEnabled(DebugLevel) {
|
|
DebugReal(fmt.Sprintf(format, args...), callerSkip)
|
|
}
|
|
}
|
|
|
|
// Debug logs a message at debug level with caller location.
|
|
func Debug(arg string) {
|
|
if isEnabled(DebugLevel) {
|
|
DebugReal(arg, callerSkip)
|
|
}
|
|
}
|
|
|
|
// DebugReal logs at debug level with caller info from the specified stack depth.
|
|
func DebugReal(arg string, cs int) {
|
|
if !isEnabled(DebugLevel) {
|
|
return
|
|
}
|
|
|
|
_, callerFile, callerLine, ok := runtime.Caller(cs)
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
tag := fmt.Sprintf("%s:%d: ", filepath.Base(callerFile), callerLine)
|
|
log.Debug(tag + arg)
|
|
}
|
|
|
|
// Dump logs a spew dump of the arguments at debug level.
|
|
func Dump(args ...any) {
|
|
if isEnabled(DebugLevel) {
|
|
DebugReal(spew.Sdump(args...), callerSkip)
|
|
}
|
|
}
|
|
|
|
// EnableDebugLogging sets the log level to debug.
|
|
func EnableDebugLogging() {
|
|
SetLevel(DebugLevel)
|
|
}
|
|
|
|
// VerbosityStepsToLogLevel converts a -v count to a log level.
|
|
// 0 returns InfoLevel, 1 returns VerboseLevel, 2+ returns DebugLevel.
|
|
func VerbosityStepsToLogLevel(l int) Level {
|
|
switch l {
|
|
case 0:
|
|
return InfoLevel
|
|
case 1:
|
|
return VerboseLevel
|
|
default:
|
|
return DebugLevel
|
|
}
|
|
}
|
|
|
|
// SetLevelFromVerbosity sets the log level based on -v flag count.
|
|
func SetLevelFromVerbosity(l int) {
|
|
SetLevel(VerbosityStepsToLogLevel(l))
|
|
}
|
|
|
|
// SetLevel sets the global log level.
|
|
func SetLevel(l Level) {
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
|
|
currentLevel = l
|
|
}
|
|
|
|
// GetLevel returns the current log level.
|
|
func GetLevel() Level {
|
|
mu.RLock()
|
|
defer mu.RUnlock()
|
|
|
|
return currentLevel
|
|
}
|
|
|
|
// WithError returns a log entry with the error attached.
|
|
func WithError(e error) *log.Entry {
|
|
return log.Log.WithError(e)
|
|
}
|
|
|
|
// Progressf prints a progress message that overwrites the current line.
|
|
// Use ProgressDone() when progress is complete to move to the next line.
|
|
func Progressf(format string, args ...any) {
|
|
pterm.Printf("\r"+format, args...)
|
|
}
|
|
|
|
// ProgressDone clears the progress line when progress is complete.
|
|
func ProgressDone() {
|
|
// Clear the line with spaces and return to beginning
|
|
pterm.Print("\r\033[K")
|
|
}
|