diff --git a/database/driver.go b/database/driver.go index 2999b6115..0b88a45ba 100644 --- a/database/driver.go +++ b/database/driver.go @@ -6,8 +6,6 @@ package database import ( "fmt" - - "github.com/btcsuite/btclog" ) // Driver defines a structure for backend drivers to use when they registered @@ -26,9 +24,6 @@ type Driver struct { // arguments to open the database. This function must return // ErrDbDoesNotExist if the database has not already been created. Open func(args ...interface{}) (DB, error) - - // UseLogger uses a specified Logger to output package logging info. - UseLogger func(logger btclog.Logger) } // driverList holds all of the registered database backends. diff --git a/database/ffldb/driver.go b/database/ffldb/driver.go index ec17c48a7..24227f135 100644 --- a/database/ffldb/driver.go +++ b/database/ffldb/driver.go @@ -9,11 +9,8 @@ import ( "github.com/daglabs/btcd/database" "github.com/daglabs/btcd/wire" - "github.com/btcsuite/btclog" ) -var log = btclog.Disabled - const ( dbType = "ffldb" ) @@ -63,19 +60,12 @@ func createDBDriver(args ...interface{}) (database.DB, error) { return openDB(dbPath, network, true) } -// useLogger is the callback provided during driver registration that sets the -// current logger to the provided one. -func useLogger(logger btclog.Logger) { - log = logger -} - func init() { // Register the driver. driver := database.Driver{ - DbType: dbType, - Create: createDBDriver, - Open: openDBDriver, - UseLogger: useLogger, + DbType: dbType, + Create: createDBDriver, + Open: openDBDriver, } if err := database.RegisterDriver(driver); err != nil { panic(fmt.Sprintf("Failed to regiser database driver '%s': %v", diff --git a/database/ffldb/log.go b/database/ffldb/log.go new file mode 100644 index 000000000..408145102 --- /dev/null +++ b/database/ffldb/log.go @@ -0,0 +1,20 @@ +// Copyright (c) 2013-2016 The btcsuite developers +// Use of this source code is governed by an ISC +// license that can be found in the LICENSE file. + +package ffldb + +import ( + "github.com/btcsuite/btclog" + "github.com/daglabs/btcd/logger" +) + +// 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 btclog.Logger + +// The default amount of logging is none. +func init() { + log, _ = logger.Get(logger.SubsystemTags.BCDB) +} diff --git a/database/log.go b/database/log.go index 461288e7a..bab887442 100644 --- a/database/log.go +++ b/database/log.go @@ -17,10 +17,4 @@ var log btclog.Logger // The default amount of logging is none. func init() { log, _ = logger.Get(logger.SubsystemTags.BCDB) - // Update the logger for the registered drivers. - for _, drv := range drivers { - if drv.UseLogger != nil { - drv.UseLogger(log) - } - } }