Merge base fork

[snikch]

This merges sirupsen/logrus@master into our branch. I've tested this in vend/log@levels -> vend/cardinal. Everything seems to be working as expected but it would be good if I can get another DRI to check in their service that it all works as expected.

[dizaknz]

A few of the tests import github.com/sirupsen/logrus

example_basic_test.go:6:        "github.com/sirupsen/logrus"
example_global_hook_test.go:4:  "github.com/sirupsen/logrus"
example_hook_test.go:9: "github.com/sirupsen/logrus"
example_hook_test.go:10:        slhooks "github.com/sirupsen/logrus/hooks/syslog"
hook_test.go:12:        . "github.com/sirupsen/logrus"
hook_test.go:13:        . "github.com/sirupsen/logrus/internal/testutils"
internal/testutils/testutils.go:10:     . "github.com/sirupsen/logrus"
logrus_test.go:16:      . "github.com/sirupsen/logrus"
logrus_test.go:17:      . "github.com/sirupsen/logrus/internal/testutils"
logrus_test.go:41:                      "github.com/sirupsen/logrus_test.TestReportCallerWhenConfigured.func3", fields["func"])
logrus_test.go:348:             "github.com/sirupsen/logrus_test.TestNestedLoggingReportsCorrectCaller", fields["func"])
logrus_test.go:378:             "github.com/sirupsen/logrus_test.TestNestedLoggingReportsCorrectCaller", fields["func"])

[dizaknz]

👍 59f8d88 - fixed

[dizaknz]

Tested locally on shifta and seems all good. Just required a dep ensure to vendor golang.org/x/crypto/ssh/terminal

[dizaknz]

Seems okay, except for one test failure (as you've already noted)

 go test $(go list ./... | grep -v /vendor/)

ok      github.com/vend/logrus  0.436s
?       github.com/vend/logrus/examples/basic   [no test files]
--- FAIL: TestLogstashFormatter (0.00s)
        logstash_test.go:46: 
                        Error Trace:    logstash_test.go:46
                        Error:          Not equal: 
                                        expected: string("Get http://example.com The error")
                                        actual  : map[string]interface {}(map[string]interface {}{"Op":"Get", "URL":"http://example.com", "Err":map[string]interface {}{}})
                        Test:           TestLogstashFormatter
FAIL
FAIL    github.com/vend/logrus/formatters/logstash      0.017s
ok      github.com/vend/logrus/hooks/syslog     0.019s
ok      github.com/vend/logrus/hooks/test       0.026s
?       github.com/vend/logrus/internal/testutils       [no test files]