Skip to content

force logs as json #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+14 −2
Open

force logs as json #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75920a5
Merge remote-tracking branch 'upstream/master'
prune998 Oct 21, 2020
9e8d0d4
Merge remote-tracking branch 'upstream/master'
prune998 Jul 20, 2021
1b653cb
force logs as json
prune998 Oct 6, 2020
89e7894
added JSON logging flag
prune998 Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions command/daemon/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import (

// Config stores the system configuration.
type Config struct {
Debug bool `envconfig:"DRONE_DEBUG"`
Trace bool `envconfig:"DRONE_TRACE"`
Debug bool `envconfig:"DRONE_DEBUG"`
Trace bool `envconfig:"DRONE_TRACE"`
LogJSON bool `envconfig:"DRONE_LOG_JSON"`

Client struct {
Address string `ignored:"true"`
Expand Down
3 changes: 3 additions & 0 deletions command/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@ func setupLogger(config Config) {
if config.Trace {
logrus.SetLevel(logrus.TraceLevel)
}
if config.LogJSON {
logrus.SetFormatter(&logrus.JSONFormatter{})
}
}

// Register the daemon command.
Expand Down
8 changes: 8 additions & 0 deletions command/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ type execCommand struct {
Procs int64
Debug bool
Trace bool
LogJSON bool
Copy link
Collaborator

@bradrydzewski bradrydzewski Jul 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest backing out the changes to this file. The exec command is used for local development and testing only and we would never need / use json logging here.

Dump bool
PublicKey string
PrivateKey string
Expand Down Expand Up @@ -224,6 +225,10 @@ func (c *execCommand) run(*kingpin.ParseContext) error {
if c.Trace {
logrus.SetLevel(logrus.TraceLevel)
}
if c.LogJSON {
logrus.SetFormatter(&logrus.JSONFormatter{})
}

logger.Default = logger.Logrus(
logrus.NewEntry(
logrus.StandardLogger(),
Expand Down Expand Up @@ -357,6 +362,9 @@ func registerExec(app *kingpin.Application) {
cmd.Flag("trace", "enable trace logging").
BoolVar(&c.Trace)

cmd.Flag("log-json", "enable JSON structured logging").
BoolVar(&c.LogJSON)

cmd.Flag("dump", "dump the pipeline state to stdout").
BoolVar(&c.Dump)

Expand Down