luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

command: remove unused logOutput field

This commit is contained in:
Daniel Nephin 2020-03-30 13:50:58 -04:00
parent 823295fe2a
commit 7064dfbfba
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/agent/agent.go
View File

@ -3,7 +3,6 @@ package agent
import ( import (
"flag" "flag"
"fmt" "fmt"
"io"
"os" "os"
"os/signal" "os/signal"
"path/filepath" "path/filepath"
@ -59,7 +58,6 @@ type cmd struct {
versionHuman string versionHuman string
shutdownCh <-chan struct{} shutdownCh <-chan struct{}
flagArgs config.Flags flagArgs config.Flags
logOutput io.Writer
logger hclog.InterceptLogger logger hclog.InterceptLogger
} }
@ -205,7 +203,6 @@ func (c *cmd) run(args []string) int {
if !ok { if !ok {
return 1 return 1
} }
c.logOutput = logOutput
c.logger = logger c.logger = logger

8
command/connect/proxy/proxy.go
View File

@ -3,7 +3,6 @@ package proxy
import ( import (
"flag" "flag"
"fmt" "fmt"
"io"
"log" "log"
"net" "net"
"net/http" "net/http"
@ -43,8 +42,7 @@ type cmd struct {
shutdownCh <-chan struct{} shutdownCh <-chan struct{}
logOutput io.Writer logger hclog.Logger
logger hclog.Logger
// flags // flags
logLevel string logLevel string
@ -138,12 +136,10 @@ func (c *cmd) Run(args []string) int {
Name: logging.Proxy, Name: logging.Proxy,
LogJSON: c.logJSON, LogJSON: c.logJSON,
} }
logger, logGate, logOutput, ok := logging.Setup(logConfig, c.UI) logger, logGate, _, ok := logging.Setup(logConfig, c.UI)
if !ok { if !ok {
return 1 return 1
} }
c.logOutput = logOutput
c.logger = logger c.logger = logger
// Enable Pprof if needed // Enable Pprof if needed