diff --git a/util/addblock/addblock.go b/util/addblock/addblock.go index a1d68432..db07df4d 100644 --- a/util/addblock/addblock.go +++ b/util/addblock/addblock.go @@ -10,10 +10,10 @@ import ( "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" _ "github.com/conformal/btcdb/sqlite3" + "github.com/conformal/btclog" "github.com/conformal/btcutil" "github.com/conformal/btcwire" "github.com/conformal/go-flags" - "github.com/conformal/seelog" "io" "os" "path/filepath" @@ -39,7 +39,7 @@ const ( var ( btcdHomeDir = btcutil.AppDataDir("btcd", false) defaultDataDir = filepath.Join(btcdHomeDir, "data") - log seelog.LoggerInterface + log btclog.Logger ) type bufQueue struct { @@ -69,13 +69,9 @@ func main() { runtime.GOMAXPROCS(runtime.NumCPU()) - log, err = seelog.LoggerFromWriterWithMinLevel(os.Stdout, - seelog.InfoLvl) - if err != nil { - fmt.Fprintf(os.Stderr, "failed to create logger: %v", err) - return - } - defer log.Flush() + backendLogger := btclog.NewDefaultBackendLogger() + defer backendLogger.Flush() + log = btclog.NewSubsystemLogger(backendLogger, "") btcdb.UseLogger(log) var testnet string @@ -226,27 +222,3 @@ func readBlocks(fi io.Reader, bufqueue chan *bufQueue) { height++ } } - -// newLogger creates a new seelog logger using the provided logging level and -// log message prefix. -func newLogger(level string, prefix string) seelog.LoggerInterface { - fmtstring := ` - - - - - - - - ` - config := fmt.Sprintf(fmtstring, level, prefix) - - logger, err := seelog.LoggerFromConfigAsString(config) - if err != nil { - fmt.Fprintf(os.Stderr, "failed to create logger: %v", err) - os.Exit(1) - } - - return logger -} diff --git a/util/dropafter/dropafter.go b/util/dropafter/dropafter.go index 5beb733c..00bb15d2 100644 --- a/util/dropafter/dropafter.go +++ b/util/dropafter/dropafter.go @@ -9,10 +9,10 @@ import ( "fmt" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" + "github.com/conformal/btclog" "github.com/conformal/btcutil" "github.com/conformal/btcwire" "github.com/conformal/go-flags" - "github.com/conformal/seelog" "os" "path/filepath" "strconv" @@ -30,7 +30,7 @@ type config struct { var ( btcdHomeDir = btcutil.AppDataDir("btcd", false) defaultDataDir = filepath.Join(btcdHomeDir, "data") - log seelog.LoggerInterface + log btclog.Logger ) const ( @@ -52,13 +52,9 @@ func main() { return } - log, err = seelog.LoggerFromWriterWithMinLevel(os.Stdout, - seelog.TraceLvl) - if err != nil { - fmt.Fprintf(os.Stderr, "failed to create logger: %v", err) - return - } - defer log.Flush() + backendLogger := btclog.NewDefaultBackendLogger() + defer backendLogger.Flush() + log = btclog.NewSubsystemLogger(backendLogger, "") btcdb.UseLogger(log) var testnet string diff --git a/util/showblock/showblock.go b/util/showblock/showblock.go index 61551513..1e4ba25b 100644 --- a/util/showblock/showblock.go +++ b/util/showblock/showblock.go @@ -7,14 +7,13 @@ package main import ( "encoding/binary" "errors" - "fmt" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" _ "github.com/conformal/btcdb/sqlite3" + "github.com/conformal/btclog" "github.com/conformal/btcutil" "github.com/conformal/btcwire" "github.com/conformal/go-flags" - "github.com/conformal/seelog" "github.com/davecgh/go-spew/spew" "io" "os" @@ -40,7 +39,7 @@ type config struct { var ( btcdHomeDir = btcutil.AppDataDir("btcd", false) defaultDataDir = filepath.Join(btcdHomeDir, "data") - log seelog.LoggerInterface + log btclog.Logger ) const ( @@ -64,13 +63,9 @@ func main() { return } - log, err = seelog.LoggerFromWriterWithMinLevel(os.Stdout, - seelog.InfoLvl) - if err != nil { - fmt.Fprintf(os.Stderr, "failed to create logger: %v", err) - return - } - defer log.Flush() + backendLogger := btclog.NewDefaultBackendLogger() + defer backendLogger.Flush() + log = btclog.NewSubsystemLogger(backendLogger, "") btcdb.UseLogger(log) var testnet string