kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli Ui implementation that logs to a hclogger

Browse Source 
This makes it so any messages output to the UI *after* the agent has started
will be logged in json format correctly
This commit is contained in:
Preetha Appan
2019-02-19 17:53:14 -06:00
parent 427ab71b47
commit b3b4d7b9a3
2 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
command/agent/command.go
View File

@@ -15,18 +15,19 @@ import (
"syscall"
"time"
metrics "github.com/armon/go-metrics"
"github.com/armon/go-metrics"
"github.com/armon/go-metrics/circonus"
"github.com/armon/go-metrics/datadog"
"github.com/armon/go-metrics/prometheus"
"github.com/hashicorp/consul/lib"
checkpoint "github.com/hashicorp/go-checkpoint"
discover "github.com/hashicorp/go-discover"
gsyslog "github.com/hashicorp/go-syslog"
"github.com/hashicorp/go-checkpoint"
"github.com/hashicorp/go-discover"
"github.com/hashicorp/go-syslog"
"github.com/hashicorp/logutils"
"github.com/hashicorp/nomad/helper"
flaghelper "github.com/hashicorp/nomad/helper/flag-helpers"
gatedwriter "github.com/hashicorp/nomad/helper/gated-writer"
"github.com/hashicorp/nomad/helper/flag-helpers"
"github.com/hashicorp/nomad/helper/gated-writer"
"github.com/hashicorp/nomad/helper/logging"
"github.com/hashicorp/nomad/nomad/structs/config"
"github.com/hashicorp/nomad/version"
"github.com/mitchellh/cli"
@@ -576,6 +577,12 @@ func (c *Command) Run(args []string) int {
}
defer c.agent.Shutdown()
// After the agent is created we have a logger, so swap out the implementation
// of the UI if json logging is enabled
if config.LogJson {
c.Ui = &logging.HcLogUI{Log: c.agent.logger}
}
// Shutdown the HTTP server at the end
defer func() {
if c.httpServer != nil {