mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-04 22:37:55 +00:00
Lunny Xiaoandbircni
de961b91eb
Add `act/common/logging`: a printf-style `Logger` on a slog-shaped `Handler`, with a logrus-backed handler as the only backend, plus a `logtest` handler for tests. Move the job logger onto it: `common.Logger` returns `*logging.Logger`, the job log formatters and the `Reporter` hook become handlers, and composite step IDs travel in the context. Logging is tightly coupled to logrus types (hooks, formatters, `Entry.Data`). Going through our own interface first lets the remaining call sites move over with unchanged behavior, and lets the backend be swapped for `log/slog` in one place afterwards. The global process logger and its masking formatter stay on logrus for now. Assisted-by: Codet Co-authored-by: bircni <[email protected]> Reviewed-on: https://gitea.com/gitea/runner/pulls/1295 Reviewed-by: bircni <[email protected]>
87 lines
2.0 KiB
Go
87 lines
2.0 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)
|
|
msg := dockerMessage{}
|
|
|
|
for scanner.Scan() {
|
|
line := scanner.Bytes()
|
|
|
|
msg.ID = ""
|
|
msg.Stream = ""
|
|
msg.Error = ""
|
|
msg.ErrorDetail.Message = ""
|
|
msg.Status = ""
|
|
msg.Progress = ""
|
|
|
|
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...)
|
|
}
|
|
}
|