mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-04 14:35:32 +00:00
silverwind
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 <[email protected]> Co-authored-by: silverwind <[email protected]>
58 lines
1.7 KiB
Go
58 lines
1.7 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package common
|
|
|
|
import (
|
|
"context"
|
|
|
|
"gitea.com/gitea/runner/act/common/logging"
|
|
)
|
|
|
|
type loggerContextKey string
|
|
|
|
const loggerContextKeyVal = loggerContextKey("logging.Logger")
|
|
|
|
// Logger returns the appropriate logger for current context
|
|
func Logger(ctx context.Context) *logging.Logger {
|
|
if logger, ok := ctx.Value(loggerContextKeyVal).(*logging.Logger); ok {
|
|
return logger
|
|
}
|
|
return logging.Default()
|
|
}
|
|
|
|
// WithLogger adds a value to the context for the logger
|
|
func WithLogger(ctx context.Context, logger *logging.Logger) context.Context {
|
|
return context.WithValue(ctx, loggerContextKeyVal, logger)
|
|
}
|
|
|
|
type loggerHandlerKey string
|
|
|
|
const loggerHandlerKeyVal = loggerHandlerKey("logging.Handler")
|
|
|
|
// LoggerHandler returns the extra handler the job logger sends its records to, or nil.
|
|
// It affects the job logger, not the global logger.
|
|
func LoggerHandler(ctx context.Context) logging.Handler {
|
|
h, _ := ctx.Value(loggerHandlerKeyVal).(logging.Handler)
|
|
return h
|
|
}
|
|
|
|
// WithLoggerHandler adds the extra handler for the job logger to the context
|
|
func WithLoggerHandler(ctx context.Context, h logging.Handler) context.Context {
|
|
return context.WithValue(ctx, loggerHandlerKeyVal, h)
|
|
}
|
|
|
|
type stepIDsContextKey struct{}
|
|
|
|
// StepIDs returns the IDs of the step and the composite steps enclosing the current one, outermost first.
|
|
func StepIDs(ctx context.Context) []string {
|
|
ids, _ := ctx.Value(stepIDsContextKey{}).([]string)
|
|
return ids
|
|
}
|
|
|
|
// WithStepIDs replaces the step IDs in the context
|
|
func WithStepIDs(ctx context.Context, ids []string) context.Context {
|
|
return context.WithValue(ctx, stepIDsContextKey{}, ids)
|
|
}
|