Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
logging: Use WithError() for all errors
Browse files Browse the repository at this point in the history
Use the standard `logrus.WithError()` API to handle logging of all
errors.

Fixes #85.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
  • Loading branch information
jodh-intel committed Jun 28, 2018
1 parent 15459f4 commit 7681a94
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func printAgentLogs(sock string) error {

agentLogsAddr, err := unixAddr(sock)
if err != nil {
logger().WithField("socket-address", sock).Fatal("invalid agent logs socket address")
logger().WithField("socket-address", sock).WithError(err).Fatal("invalid agent logs socket address")
return err
}

Expand Down Expand Up @@ -193,7 +193,7 @@ func printAgentLogs(sock string) error {
}

if err := scanner.Err(); err != nil {
logger().Errorf("Failed reading agent logs from socket: %v", err)
logger().WithError(err).Error("Failed reading agent logs from socket")
}
}()

Expand Down Expand Up @@ -316,11 +316,11 @@ func realMain() {
sigCh := setupNotifier()

if err := setupLogger(logLevel); err != nil {
logger().Fatal(err)
logger().WithError(err).Fatal("unable to setup logger")
}

if err := printAgentLogs(agentLogsSocket); err != nil {
logger().Fatal(err)
logger().WithError(err).Fatal("failed to print agent logs")
return
}

Expand All @@ -330,14 +330,14 @@ func realMain() {
}
listenAddr, err := unixAddr(proxyAddr)
if err != nil {
logger().Fatal("invalid listen socket address")
logger().WithError(err).Fatal("invalid listen socket address")
return
}

// yamux connection
servConn, err := net.Dial("unix", muxAddr)
if err != nil {
logger().Fatalf("failed to dial channel(%q): %s", muxAddr, err)
logger().WithError(err).WithField("channel", muxAddr).Fatal("failed to dial channel")
return
}
defer func() {
Expand All @@ -349,7 +349,7 @@ func realMain() {
results := make(chan error)
l, err := serve(servConn, "unix", listenAddr, results)
if err != nil {
logger().Fatal(err)
logger().WithError(err).Fatal("failed to serve")
return
}
defer func() {
Expand All @@ -361,14 +361,13 @@ func realMain() {
go func() {
for err := range results {
if err != nil {
logger().Fatal(err)
logger().WithError(err).Fatal("channel error")
}
}
}()

if err := handleExitSignal(sigCh, &servConn, &l); err != nil {
logger().Fatal(err)
return
logger().WithError(err).Fatal("failed to handle exit signal")
}

logger().Debug("shutting down")
Expand Down

0 comments on commit 7681a94

Please sign in to comment.