From f7f51a1e43b56b97c96a273a76397186d666d5ed Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Thu, 21 Nov 2013 09:35:08 -0600 Subject: [PATCH] Use btclog for logging. --- log.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/log.go b/log.go index 0c273bd31..cf4634493 100644 --- a/log.go +++ b/log.go @@ -6,14 +6,14 @@ package btcchain import ( "errors" - "github.com/conformal/seelog" + "github.com/conformal/btclog" "io" ) // log is a logger that is initialized with no output filters. This // means the package will not perform any logging by default until the caller // requests it. -var log seelog.LoggerInterface +var log btclog.Logger // The default amount of logging is none. func init() { @@ -23,26 +23,31 @@ func init() { // DisableLog disables all library log output. Logging output is disabled // by default until either UseLogger or SetLogWriter are called. func DisableLog() { - log = seelog.Disabled + log = btclog.Disabled } // UseLogger uses a specified Logger to output package logging info. // This should be used in preference to SetLogWriter if the caller is also -// using seelog. -func UseLogger(logger seelog.LoggerInterface) { +// using btclog. +func UseLogger(logger btclog.Logger) { log = logger } // SetLogWriter uses a specified io.Writer to output package logging info. // This allows a caller to direct package logging output without needing a -// dependency on seelog. If the caller is also using seelog, UseLogger should +// dependency on seelog. If the caller is also using btclog, UseLogger should // be used instead. -func SetLogWriter(w io.Writer) error { +func SetLogWriter(w io.Writer, level string) error { if w == nil { return errors.New("nil writer") } - l, err := seelog.LoggerFromWriterWithMinLevel(w, seelog.TraceLvl) + lvl, ok := btclog.LogLevelFromString(level) + if !ok { + return errors.New("invalid log level") + } + + l, err := btclog.NewLoggerFromWriter(w, lvl) if err != nil { return err }