Add opt save global log output to file (#2115)

close  #1933

---------
*Sponsored by Kithara Software GmbH*
This commit is contained in:
6543
2023-08-07 20:47:30 +02:00
committed by GitHub
parent 0b5f1a7c0d
commit 3d4758578a
12 changed files with 158 additions and 121 deletions

View File

@@ -27,7 +27,6 @@ import (
"sync"
"time"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/tevino/abool"
"github.com/urfave/cli/v2"
@@ -41,6 +40,7 @@ import (
"github.com/woodpecker-ci/woodpecker/agent"
agentRpc "github.com/woodpecker-ci/woodpecker/agent/rpc"
"github.com/woodpecker-ci/woodpecker/cmd/common"
"github.com/woodpecker-ci/woodpecker/pipeline/backend"
"github.com/woodpecker-ci/woodpecker/pipeline/backend/types"
"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
@@ -49,6 +49,8 @@ import (
)
func run(c *cli.Context) error {
common.SetupGlobalLogger(c)
agentConfigPath := c.String("agent-config")
hostname := c.String("hostname")
if len(hostname) == 0 {
@@ -57,28 +59,6 @@ func run(c *cli.Context) error {
platform := runtime.GOOS + "/" + runtime.GOARCH
if c.Bool("pretty") {
log.Logger = log.Output(
zerolog.ConsoleWriter{
Out: os.Stderr,
NoColor: c.Bool("nocolor"),
},
)
}
zerolog.SetGlobalLevel(zerolog.InfoLevel)
if c.IsSet("log-level") {
logLevelFlag := c.String("log-level")
lvl, err := zerolog.ParseLevel(logLevelFlag)
if err != nil {
log.Fatal().Msgf("unknown logging level: %s", logLevelFlag)
}
zerolog.SetGlobalLevel(lvl)
}
if zerolog.GlobalLevel() <= zerolog.DebugLevel {
log.Logger = log.With().Caller().Logger()
}
counter.Polling = c.Int("max-workflows")
counter.Running = 0

View File

@@ -20,9 +20,11 @@ import (
"time"
"github.com/urfave/cli/v2"
"github.com/woodpecker-ci/woodpecker/cmd/common"
)
var flags = []cli.Flag{
var flags = append([]cli.Flag{
&cli.StringFlag{
EnvVars: []string{"WOODPECKER_SERVER"},
Name: "server",
@@ -46,22 +48,6 @@ var flags = []cli.Flag{
Usage: "should the grpc server certificate be verified, only valid when WOODPECKER_GRPC_SECURE is true",
Value: true,
},
&cli.StringFlag{
EnvVars: []string{"WOODPECKER_LOG_LEVEL"},
Name: "log-level",
Usage: "set logging level",
},
&cli.BoolFlag{
EnvVars: []string{"WOODPECKER_DEBUG_PRETTY"},
Name: "pretty",
Usage: "enable pretty-printed debug output",
},
&cli.BoolFlag{
EnvVars: []string{"WOODPECKER_DEBUG_NOCOLOR"},
Name: "nocolor",
Usage: "disable colored debug output",
Value: true,
},
&cli.StringFlag{
EnvVars: []string{"WOODPECKER_HOSTNAME"},
Name: "hostname",
@@ -208,4 +194,4 @@ var flags = []cli.Flag{
Usage: "duration to wait before retrying to connect to the server",
Value: time.Second * 2,
},
}
}, common.GlobalLoggerFlags...)