mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-10-30 20:08:41 +08:00
Removes dead code and redundant logic and consolidates tests, so there is less to read and maintain. No behavior change. 1. **act/runner**: inline single-use wrappers, compile regexes once instead of per call, embed the trampoline as a string, drop the unused legacy result of `parseActionCommand` 2. **act/container**: `sanitizeConfig` and `mergeContainerConfigs` stop returning the configs they already mutate in place, drop never-set option fields and the unused `user` parameter of `ExecWithCmdLine` 3. **act/common and cache server**: drop the unused `Trace`/`Tracef` loggers and the short SHA of `FindGitRevision`, `RegisterJob` releases through `RevokeJob` 4. **daemon, poller and reporter**: one shutdown wait for both poll modes, drop an unreachable fetch timeout branch, guard the reporter's last report time with its existing lock instead of an atomic 5. **build**: drop unused Makefile and release workflow variables, collapse the goreleaser ignore list to the same build targets 6. **tests**: fold near-duplicate tests into tables with shared setup Throughout, hand-rolled logic gives way to `cmp.Or`, `strings.Cut`, `slices` and `min`/`max`. Reviewed-on: https://gitea.com/gitea/runner/pulls/1335 Reviewed-by: bircni <bircni@icloud.com> Co-authored-by: silverwind <me@silverwind.io>
84 lines
2.9 KiB
Go
84 lines
2.9 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package logging
|
|
|
|
import (
|
|
"io"
|
|
"log/slog"
|
|
"os"
|
|
"runtime"
|
|
"sync/atomic"
|
|
)
|
|
|
|
// TextOptions describes how the process-wide Logger writes a record as text.
|
|
type TextOptions struct {
|
|
DisableColors bool
|
|
DisableTimestamp bool
|
|
FullTimestamp bool
|
|
// CallerPrettyfier renames the function and file reported with a record when ReportCaller is on.
|
|
CallerPrettyfier func(*runtime.Frame) (function, file string)
|
|
// Filter rewrites each formatted line, for example to mask secrets.
|
|
Filter func(line []byte) []byte
|
|
}
|
|
|
|
var (
|
|
std atomic.Pointer[Logger]
|
|
stdState = newConsole(os.Stderr)
|
|
)
|
|
|
|
func init() {
|
|
std.Store(New(NewSlogHandler(&consoleHandler{c: stdState})))
|
|
}
|
|
|
|
// Default returns the process-wide Logger.
|
|
func Default() *Logger { return std.Load() }
|
|
|
|
// SetDefault replaces the process-wide Logger, which tests use to capture what the package
|
|
// functions log. SetLevel, GetLevel, SetOutput and the format functions keep configuring the
|
|
// initial console Logger.
|
|
func SetDefault(l *Logger) { std.Store(l) }
|
|
|
|
// SetLevel sets the minimum level of the initial process-wide Logger.
|
|
func SetLevel(level Level) { stdState.level.Set(slog.Level(level)) }
|
|
|
|
// GetLevel returns the minimum level of the initial process-wide Logger.
|
|
func GetLevel() Level { return Level(stdState.level.Level()) }
|
|
|
|
// SetOutput sets where the initial process-wide Logger writes.
|
|
func SetOutput(w io.Writer) { stdState.setOutput(w) }
|
|
|
|
// Output returns where the initial process-wide Logger writes.
|
|
func Output() io.Writer {
|
|
stdState.mu.Lock()
|
|
defer stdState.mu.Unlock()
|
|
return stdState.out
|
|
}
|
|
|
|
// SetTextFormat sets the text format of the initial process-wide Logger.
|
|
func SetTextFormat(o TextOptions) {
|
|
stdState.mu.Lock()
|
|
defer stdState.mu.Unlock()
|
|
stdState.opts = o
|
|
}
|
|
|
|
// SetReportCaller makes the initial process-wide Logger record where each call came from, which costs time.
|
|
func SetReportCaller(on bool) {
|
|
stdState.mu.Lock()
|
|
defer stdState.mu.Unlock()
|
|
stdState.reportCaller = on
|
|
}
|
|
|
|
func Enabled(level Level) bool { return Default().Enabled(level) }
|
|
|
|
func With(args ...any) *Logger { return Default().With(args...) }
|
|
func WithError(err error) *Logger { return Default().WithError(err) }
|
|
func Debugf(format string, args ...any) { Default().logf(LevelDebug, format, args) }
|
|
func Infof(format string, args ...any) { Default().logf(LevelInfo, format, args) }
|
|
func Warnf(format string, args ...any) { Default().logf(LevelWarn, format, args) }
|
|
func Errorf(format string, args ...any) { Default().logf(LevelError, format, args) }
|
|
func Debug(args ...any) { Default().log(LevelDebug, args) }
|
|
func Info(args ...any) { Default().log(LevelInfo, args) }
|
|
func Warn(args ...any) { Default().log(LevelWarn, args) }
|
|
func Error(args ...any) { Default().log(LevelError, args) }
|