github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-21 23:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve logging (#1158)

Browse Source 
* switch default log level to info add start message and cleanup server start
* refactor code
* fix agent debug / trace logging
This commit is contained in:
Anbraten
2022-09-03 20:41:23 +02:00
committed by GitHub
parent 297732eab8
commit 5ca7ede9e4
6 changed files with 104 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/agent/agent.go
View File

@@ -37,6 +37,7 @@ import (
"github.com/woodpecker-ci/woodpecker/pipeline/backend"
"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
"github.com/woodpecker-ci/woodpecker/shared/utils"
"github.com/woodpecker-ci/woodpecker/version"
)
func loop(c *cli.Context) error {
@@ -69,11 +70,7 @@ func loop(c *cli.Context) error {
)
}
zerolog.SetGlobalLevel(zerolog.WarnLevel)
if zerolog.GlobalLevel() <= zerolog.DebugLevel {
log.Logger = log.With().Caller().Logger()
}
zerolog.SetGlobalLevel(zerolog.InfoLevel)
if c.IsSet("log-level") {
logLevelFlag := c.String("log-level")
lvl, err := zerolog.ParseLevel(logLevelFlag)
@@ -82,6 +79,9 @@ func loop(c *cli.Context) error {
}
zerolog.SetGlobalLevel(lvl)
}
if zerolog.GlobalLevel() <= zerolog.DebugLevel {
log.Logger = log.With().Caller().Logger()
}
counter.Polling = c.Int("max-procs")
counter.Running = 0
@@ -138,17 +138,17 @@ func loop(c *cli.Context) error {
parallel := c.Int("max-procs")
wg.Add(parallel)
// new engine
engine, err := backend.FindEngine(c.String("backend-engine"))
if err != nil {
log.Error().Err(err).Msgf("cannot find backend engine '%s'", c.String("backend-engine"))
return err
}
for i := 0; i < parallel; i++ {
go func() {
defer wg.Done()
// new engine
engine, err := backend.FindEngine(c.String("backend-engine"))
if err != nil {
log.Error().Err(err).Msgf("cannot find backend engine '%s'", c.String("backend-engine"))
return
}
// load engine (e.g. init api client)
err = engine.Load()
if err != nil {
@@ -174,6 +174,10 @@ func loop(c *cli.Context) error {
}()
}
log.Info().Msgf(
"Starting Woodpecker agent with version '%s' and backend '%s' running up to %d pipelines in parallel",
version.String(), engine.Name(), parallel)
wg.Wait()
return nil
}