mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-05 14:55:44 +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]>
78 lines
1.9 KiB
Go
78 lines
1.9 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd))
|
|
|
|
package container
|
|
|
|
import (
|
|
"bufio"
|
|
"encoding/json/v2"
|
|
"errors"
|
|
"io"
|
|
|
|
"gitea.com/gitea/runner/act/common/logging"
|
|
)
|
|
|
|
type dockerMessage struct {
|
|
ID string `json:"id"`
|
|
Stream string `json:"stream"`
|
|
Error string `json:"error"`
|
|
ErrorDetail struct {
|
|
Message string `json:"message"`
|
|
} `json:"errorDetail"`
|
|
Status string `json:"status"`
|
|
Progress string `json:"progress"`
|
|
}
|
|
|
|
func logDockerResponse(logger *logging.Logger, dockerResponse io.ReadCloser, isError bool) error {
|
|
if dockerResponse == nil {
|
|
return nil
|
|
}
|
|
defer dockerResponse.Close()
|
|
|
|
scanner := bufio.NewScanner(dockerResponse)
|
|
for scanner.Scan() {
|
|
line := scanner.Bytes()
|
|
var msg dockerMessage
|
|
if err := json.Unmarshal(line, &msg); err != nil {
|
|
writeLog(logger, false, "Unable to unmarshal line [%s] ==> %v", string(line), err)
|
|
continue
|
|
}
|
|
|
|
if msg.Error != "" {
|
|
writeLog(logger, isError, "%s", msg.Error)
|
|
return errors.New(msg.Error)
|
|
}
|
|
|
|
if msg.ErrorDetail.Message != "" {
|
|
writeLog(logger, isError, "%s", msg.ErrorDetail.Message)
|
|
return errors.New(msg.ErrorDetail.Message)
|
|
}
|
|
|
|
switch {
|
|
case msg.Status != "":
|
|
if msg.Progress != "" {
|
|
writeLog(logger, isError, "%s :: %s :: %s\n", msg.Status, msg.ID, msg.Progress)
|
|
} else {
|
|
writeLog(logger, isError, "%s :: %s\n", msg.Status, msg.ID)
|
|
}
|
|
case msg.Stream != "":
|
|
writeLog(logger, isError, "%s", msg.Stream)
|
|
default:
|
|
writeLog(logger, false, "Unable to handle line: %s", string(line))
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func writeLog(logger *logging.Logger, isError bool, format string, args ...any) {
|
|
if isError {
|
|
logger.Errorf(format, args...)
|
|
} else {
|
|
logger.Debugf(format, args...)
|
|
}
|
|
}
|