From 85265e1d9bcc034ac9c1a5ae44d93d767cadbde5 Mon Sep 17 00:00:00 2001
From: Ori Newman <orinewman1@gmail.com>
Date: Thu, 13 Sep 2018 15:24:46 +0300
Subject: [PATCH] [DEV-115] Make sure BTCD Node runs

* [DEV-115] fix mistype mainCfg -> cfg in config/config.go

* [DEV-115] add config log
---
 config/config.go        | 7 ++++---
 database/ffldb/db.go    | 5 +++--
 logger/logger.go        | 1 +
 server/rpc/rpcserver.go | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/config/config.go b/config/config.go
index 8eecf20e9..15504ec6f 100644
--- a/config/config.go
+++ b/config/config.go
@@ -24,12 +24,13 @@ import (
 	"github.com/daglabs/btcd/dagconfig"
 	"github.com/daglabs/btcd/dagconfig/daghash"
 	"github.com/daglabs/btcd/database"
+	_ "github.com/daglabs/btcd/database/ffldb"
 	"github.com/daglabs/btcd/logger"
 	"github.com/daglabs/btcd/mempool"
-	"github.com/daglabs/btcd/version"
-	"github.com/daglabs/btcd/wire"
 	"github.com/daglabs/btcd/util"
 	"github.com/daglabs/btcd/util/network"
+	"github.com/daglabs/btcd/version"
+	"github.com/daglabs/btcd/wire"
 	flags "github.com/jessevdk/go-flags"
 )
 
@@ -491,7 +492,7 @@ func loadConfig() (*Config, []string, error) {
 
 	// Initialize log rotation.  After log rotation has been initialized, the
 	// logger variables may be used.
-	logger.InitLogRotator(filepath.Join(mainCfg.LogDir, defaultLogFilename))
+	logger.InitLogRotator(filepath.Join(cfg.LogDir, defaultLogFilename))
 
 	// Parse, validate, and set debug log level(s).
 	if err := logger.ParseAndSetDebugLevels(cfg.DebugLevel); err != nil {
diff --git a/database/ffldb/db.go b/database/ffldb/db.go
index 143e24319..f903a5c99 100644
--- a/database/ffldb/db.go
+++ b/database/ffldb/db.go
@@ -7,6 +7,7 @@ package ffldb
 import (
 	"bytes"
 	"encoding/binary"
+	"encoding/hex"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -24,8 +25,8 @@ import (
 	"github.com/daglabs/btcd/dagconfig/daghash"
 	"github.com/daglabs/btcd/database"
 	"github.com/daglabs/btcd/database/internal/treap"
-	"github.com/daglabs/btcd/wire"
 	"github.com/daglabs/btcd/util"
+	"github.com/daglabs/btcd/wire"
 )
 
 const (
@@ -633,7 +634,7 @@ func (b *bucket) CreateBucket(key []byte) (database.Bucket, error) {
 	// Ensure bucket does not already exist.
 	bidxKey := bucketIndexKey(b.id, key)
 	if b.tx.hasKey(bidxKey) {
-		str := "bucket already exists"
+		str := fmt.Sprintf("bucket %v already exists", hex.EncodeToString(bidxKey))
 		return nil, makeDbErr(database.ErrBucketExists, str, nil)
 	}
 
diff --git a/logger/logger.go b/logger/logger.go
index 25f49f33b..f4d5145a9 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -120,6 +120,7 @@ var subsystemLoggers = map[string]btclog.Logger{
 	SubsystemTags.SRVR: srvrLog,
 	SubsystemTags.SYNC: syncLog,
 	SubsystemTags.TXMP: txmpLog,
+	SubsystemTags.CNFG: cnfgLog,
 }
 
 // InitLogRotator initializes the logging rotater to write logs to logFile and
diff --git a/server/rpc/rpcserver.go b/server/rpc/rpcserver.go
index 62fbbc08a..d0b5188f0 100644
--- a/server/rpc/rpcserver.go
+++ b/server/rpc/rpcserver.go
@@ -4184,6 +4184,7 @@ func NewRPCServer(
 		AddrIndex:    p2pServer.AddrIndex,
 		CfIndex:      p2pServer.CfIndex,
 		FeeEstimator: p2pServer.FeeEstimator,
+		DAG:          p2pServer.DAG,
 	}
 	rpc := Server{
 		cfg:                    *cfg,