From 3c277b5a1af41983f2613493993391e4a1387df4 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Tue, 14 Feb 2017 15:45:06 +0000
Subject: [PATCH] Add captures, fix syslog test
---
client/methods/helpers.go | 5 ++++-
logging/config/sinks_test.go | 10 ++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/client/methods/helpers.go b/client/methods/helpers.go
index 3cc52eb3..47c7cc92 100644
--- a/client/methods/helpers.go
+++ b/client/methods/helpers.go
@@ -54,5 +54,8 @@ func loggerFromClientDo(do *definitions.ClientDo, scope string) (logging_types.I
if err != nil {
return nil, err
}
- return logging.WithScope(logger, scope), nil
+ logger = logging.WithScope(logger, scope)
+ lifecycle.CaptureStdlibLogOutput(logger)
+ lifecycle.CaptureTendermintLog15Output(logger)
+ return logger, nil
}
diff --git a/logging/config/sinks_test.go b/logging/config/sinks_test.go
index 1465bb75..e0aa4f20 100644
--- a/logging/config/sinks_test.go
+++ b/logging/config/sinks_test.go
@@ -84,12 +84,14 @@ func TestSyslogOutput(t *testing.T) {
_, _, err := Sink().SetOutput(RemoteSyslogOutput("Foo",
"tcp://logging.example.com:6514")).BuildLogger()
assert.Error(t, err)
- assert.Equal(t, "dial tcp: lookup logging.example.com: no such host",
- err.Error())
+ assert.Contains(t, err.Error(), "no such host")
logger, _, err := Sink().SetOutput(SyslogOutput("Foo")).BuildLogger()
- assert.NoError(t, err)
- logger.Log("LogTo", "Syslog")
+ if err != nil {
+ assert.Contains(t, err.Error(), "syslog delivery error")
+ } else {
+ logger.Log("LogTo", "Syslog")
+ }
}
// Takes a variadic argument of log lines as a list of key value pairs delimited
--
GitLab