[DEV-102] remove UseLogger from ffldb

This commit is contained in:
Ori Newman 2018-08-28 10:47:46 +03:00
parent 617530dd8f
commit 25d5ade7a8
4 changed files with 23 additions and 24 deletions

View File

@ -6,8 +6,6 @@ package database
import ( import (
"fmt" "fmt"
"github.com/btcsuite/btclog"
) )
// Driver defines a structure for backend drivers to use when they registered // 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 // arguments to open the database. This function must return
// ErrDbDoesNotExist if the database has not already been created. // ErrDbDoesNotExist if the database has not already been created.
Open func(args ...interface{}) (DB, error) 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. // driverList holds all of the registered database backends.

View File

@ -9,11 +9,8 @@ import (
"github.com/daglabs/btcd/database" "github.com/daglabs/btcd/database"
"github.com/daglabs/btcd/wire" "github.com/daglabs/btcd/wire"
"github.com/btcsuite/btclog"
) )
var log = btclog.Disabled
const ( const (
dbType = "ffldb" dbType = "ffldb"
) )
@ -63,19 +60,12 @@ func createDBDriver(args ...interface{}) (database.DB, error) {
return openDB(dbPath, network, true) 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() { func init() {
// Register the driver. // Register the driver.
driver := database.Driver{ driver := database.Driver{
DbType: dbType, DbType: dbType,
Create: createDBDriver, Create: createDBDriver,
Open: openDBDriver, Open: openDBDriver,
UseLogger: useLogger,
} }
if err := database.RegisterDriver(driver); err != nil { if err := database.RegisterDriver(driver); err != nil {
panic(fmt.Sprintf("Failed to regiser database driver '%s': %v", panic(fmt.Sprintf("Failed to regiser database driver '%s': %v",

20
database/ffldb/log.go Normal file
View File

@ -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)
}

View File

@ -17,10 +17,4 @@ var log btclog.Logger
// The default amount of logging is none. // The default amount of logging is none.
func init() { func init() {
log, _ = logger.Get(logger.SubsystemTags.BCDB) log, _ = logger.Get(logger.SubsystemTags.BCDB)
// Update the logger for the registered drivers.
for _, drv := range drivers {
if drv.UseLogger != nil {
drv.UseLogger(log)
}
}
} }