github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-22 00:24:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make cancel pipeline work again (#585)

Browse Source 
* logger: on level debug or trace add caller to logs

* more logging

* fix cancel bug

* ignore error if occur for queue cancel
This commit is contained in:
6543
2021-12-08 23:40:00 +01:00
committed by GitHub
parent 3ec00140d9
commit 4ea00f0035
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/agent/agent.go
View File

@@ -64,6 +64,9 @@ func loop(c *cli.Context) error {
}
zerolog.SetGlobalLevel(zerolog.DebugLevel)
}
if zerolog.GlobalLevel() <= zerolog.DebugLevel {
log.Logger = log.With().Caller().Logger()
}
if c.IsSet("log-level") {
logLevelFlag := c.String("log-level")

3
cmd/server/server.go
View File

@@ -74,6 +74,9 @@ func run(c *cli.Context) error {
}
zerolog.SetGlobalLevel(lvl)
}
if zerolog.GlobalLevel() <= zerolog.DebugLevel {
log.Logger = log.With().Caller().Logger()
}
log.Log().Msgf("LogLevel = %s", zerolog.GlobalLevel().String())
if c.String("server-host") == "" {