X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e231fef37079916d0dc6babf93d669d474598ced..c3e41ce1ad90a041d380a834e1b699685f0a5658:/sdk/go/ctxlog/log.go diff --git a/sdk/go/ctxlog/log.go b/sdk/go/ctxlog/log.go index e66eeadee1..acbb11a361 100644 --- a/sdk/go/ctxlog/log.go +++ b/sdk/go/ctxlog/log.go @@ -11,7 +11,6 @@ import ( "os" "github.com/sirupsen/logrus" - check "gopkg.in/check.v1" ) var ( @@ -41,7 +40,7 @@ func FromContext(ctx context.Context) logrus.FieldLogger { // New returns a new logger with the indicated format and // level. -func New(out io.Writer, format, level string) logrus.FieldLogger { +func New(out io.Writer, format, level string) *logrus.Logger { logger := logrus.New() logger.Out = out setFormat(logger, format) @@ -49,7 +48,7 @@ func New(out io.Writer, format, level string) logrus.FieldLogger { return logger } -func TestLogger(c *check.C) logrus.FieldLogger { +func TestLogger(c interface{ Log(...interface{}) }) *logrus.Logger { logger := logrus.New() logger.Out = &logWriter{c.Log} setFormat(logger, "text") @@ -61,6 +60,12 @@ func TestLogger(c *check.C) logrus.FieldLogger { return logger } +// LogWriter returns an io.Writer that writes to the given log func, +// which is typically (*check.C).Log(). +func LogWriter(log func(...interface{})) io.Writer { + return &logWriter{log} +} + // SetLevel sets the current logging level. See logrus for level // names. func SetLevel(level string) {