1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-11 17:50:58 +00:00

cleanup logging

Signed-off-by: Casey Lee <cplee@nektos.com>
This commit is contained in:
Casey Lee 2020-02-11 09:10:35 -08:00
parent 5ad4949607
commit c44aa2a118
12 changed files with 181 additions and 54 deletions

View file

@ -5,9 +5,7 @@ import (
"context"
"encoding/json"
"errors"
"fmt"
"io"
"os"
"github.com/nektos/act/pkg/common"
"github.com/sirupsen/logrus"
@ -26,6 +24,8 @@ type dockerMessage struct {
Progress string `json:"progress"`
}
const logPrefix = " \U0001F433 "
func logDockerOutput(ctx context.Context, dockerResponse io.Reader) {
logger := common.Logger(ctx)
if entry, ok := logger.(*logrus.Entry); ok {
@ -46,16 +46,33 @@ func logDockerOutput(ctx context.Context, dockerResponse io.Reader) {
}
func streamDockerOutput(ctx context.Context, dockerResponse io.Reader) {
out := os.Stdout
go func() {
<-ctx.Done()
fmt.Println()
}()
/*
out := os.Stdout
go func() {
<-ctx.Done()
//fmt.Println()
}()
_, err := io.Copy(out, dockerResponse)
if err != nil {
logrus.Error(err)
_, err := io.Copy(out, dockerResponse)
if err != nil {
logrus.Error(err)
}
*/
logger := common.Logger(ctx)
reader := bufio.NewReader(dockerResponse)
for {
if ctx.Err() != nil {
break
}
line, _, err := reader.ReadLine()
if err == io.EOF {
break
}
logger.Debugf("%s\n", line)
}
}
func logDockerResponse(logger logrus.FieldLogger, dockerResponse io.ReadCloser, isError bool) error {