mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-10-30 20:08:41 +08:00
d882311ec6
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.2 KiB
Go
84 lines
2.2 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
// Package logtest provides a Handler that keeps records in memory for assertions.
|
|
package logtest
|
|
|
|
import (
|
|
"context"
|
|
"slices"
|
|
"sync"
|
|
"testing"
|
|
|
|
"gitea.com/gitea/runner/act/common/logging"
|
|
)
|
|
|
|
type store struct {
|
|
mu sync.Mutex
|
|
records []logging.Record
|
|
}
|
|
|
|
// Handler records what it receives at or above its level. Loggers derived with WithAttrs share one store.
|
|
type Handler struct {
|
|
store *store
|
|
attrs []logging.Attr
|
|
minLevel logging.Level
|
|
}
|
|
|
|
// New records from LevelInfo up, like the logger of logrus's hooks/test.
|
|
func New() *Handler {
|
|
return NewWithLevel(logging.LevelInfo)
|
|
}
|
|
|
|
// NewLogger returns a Logger writing to a new Handler from New, and that Handler.
|
|
func NewLogger() (*logging.Logger, *Handler) {
|
|
h := New()
|
|
return logging.New(h), h
|
|
}
|
|
|
|
func NewWithLevel(minLevel logging.Level) *Handler {
|
|
return &Handler{store: &store{}, minLevel: minLevel}
|
|
}
|
|
|
|
func (h *Handler) Enabled(_ context.Context, level logging.Level) bool { return level >= h.minLevel }
|
|
|
|
// Handle stores the record with the attributes accumulated by WithAttrs placed first.
|
|
func (h *Handler) Handle(_ context.Context, r logging.Record) error {
|
|
r.Attrs = append(slices.Clone(h.attrs), r.Attrs...)
|
|
h.store.mu.Lock()
|
|
defer h.store.mu.Unlock()
|
|
h.store.records = append(h.store.records, r)
|
|
return nil
|
|
}
|
|
|
|
func (h *Handler) WithAttrs(attrs []logging.Attr) logging.Handler {
|
|
return &Handler{store: h.store, attrs: append(slices.Clone(h.attrs), attrs...), minLevel: h.minLevel}
|
|
}
|
|
|
|
func (h *Handler) AllRecords() []logging.Record {
|
|
h.store.mu.Lock()
|
|
defer h.store.mu.Unlock()
|
|
return slices.Clone(h.store.records)
|
|
}
|
|
|
|
// LastRecord returns nil when nothing was logged.
|
|
func (h *Handler) LastRecord() *logging.Record {
|
|
h.store.mu.Lock()
|
|
defer h.store.mu.Unlock()
|
|
if len(h.store.records) == 0 {
|
|
return nil
|
|
}
|
|
r := h.store.records[len(h.store.records)-1]
|
|
return &r
|
|
}
|
|
|
|
// SetDefault makes the process-wide Logger record into a new Handler until the test ends.
|
|
func SetDefault(t testing.TB) *Handler {
|
|
t.Helper()
|
|
prev := logging.Default()
|
|
logger, h := NewLogger()
|
|
logging.SetDefault(logger)
|
|
t.Cleanup(func() { logging.SetDefault(prev) })
|
|
return h
|
|
}
|