diff --git a/lib/blockchain/chain.js b/lib/blockchain/chain.js index 1ac7184f..841f7e95 100644 --- a/lib/blockchain/chain.js +++ b/lib/blockchain/chain.js @@ -70,7 +70,7 @@ function Chain(options) { this.options = new ChainOptions(options); this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('chain'); this.checkpoints = this.options.checkpoints; this.locker = new Lock(true); diff --git a/lib/blockchain/chaindb.js b/lib/blockchain/chaindb.js index a4749789..1245001f 100644 --- a/lib/blockchain/chaindb.js +++ b/lib/blockchain/chaindb.js @@ -53,7 +53,7 @@ function ChainDB(chain) { this.chain = chain; this.options = chain.options; this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('chaindb'); this.db = LDB(this.options); this.stateCache = new StateCache(this.network); diff --git a/lib/http/server.js b/lib/http/server.js index 4e86c555..7fcf2e25 100644 --- a/lib/http/server.js +++ b/lib/http/server.js @@ -41,7 +41,7 @@ function HTTPServer(options) { this.options = options; this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('http'); this.node = this.options.node; this.chain = this.node.chain; diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js index cba19eb0..e69273a3 100644 --- a/lib/mempool/mempool.js +++ b/lib/mempool/mempool.js @@ -75,7 +75,7 @@ function Mempool(options) { this.options = new MempoolOptions(options); this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('mempool'); this.chain = this.options.chain; this.fees = this.options.fees; diff --git a/lib/mining/cpuminer.js b/lib/mining/cpuminer.js index f6c770ab..b5c02a9e 100644 --- a/lib/mining/cpuminer.js +++ b/lib/mining/cpuminer.js @@ -32,7 +32,7 @@ function CPUMiner(miner) { this.miner = miner; this.network = this.miner.network; - this.logger = this.miner.logger; + this.logger = this.miner.logger.context('cpuminer'); this.chain = this.miner.chain; this.locker = new Lock(); diff --git a/lib/mining/miner.js b/lib/mining/miner.js index 32ed98ee..bfb3f437 100644 --- a/lib/mining/miner.js +++ b/lib/mining/miner.js @@ -36,7 +36,7 @@ function Miner(options) { this.options = new MinerOptions(options); this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('miner'); this.chain = this.options.chain; this.mempool = this.options.mempool; this.addresses = this.options.addresses; diff --git a/lib/net/bip150.js b/lib/net/bip150.js index f7aa79e3..46a73770 100644 --- a/lib/net/bip150.js +++ b/lib/net/bip150.js @@ -490,7 +490,7 @@ AuthDB.prototype._init = function _init(options) { if (options.logger != null) { assert(typeof options.logger === 'object'); - this.logger = options.logger; + this.logger = options.logger.context('authdb'); } if (options.resolve != null) { diff --git a/lib/net/hostlist.js b/lib/net/hostlist.js index d5ea9e2a..b51cb43a 100644 --- a/lib/net/hostlist.js +++ b/lib/net/hostlist.js @@ -34,7 +34,7 @@ function HostList(options) { this.options = new HostListOptions(options); this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('hostlist'); this.address = this.options.address; this.resolve = this.options.resolve; diff --git a/lib/net/peer.js b/lib/net/peer.js index b9cfb326..63a3b430 100644 --- a/lib/net/peer.js +++ b/lib/net/peer.js @@ -73,7 +73,7 @@ function Peer(options) { this.options = options; this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('peer'); this.locker = new Lock(); this.parser = new Parser(this.network); diff --git a/lib/net/pool.js b/lib/net/pool.js index c777d747..bc2cf102 100644 --- a/lib/net/pool.js +++ b/lib/net/pool.js @@ -81,7 +81,7 @@ function Pool(options) { this.options = new PoolOptions(options); this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('net'); this.chain = this.options.chain; this.mempool = this.options.mempool; this.server = this.options.createServer(); diff --git a/lib/node/node.js b/lib/node/node.js index 7d0f5eff..76d06465 100644 --- a/lib/node/node.js +++ b/lib/node/node.js @@ -81,6 +81,8 @@ Node.prototype.initOptions = function initOptions() { if (config.has('log-console')) this.logger.console = config.bool('log-console'); + + this.logger = this.logger.context('node'); }; /** diff --git a/lib/wallet/walletdb.js b/lib/wallet/walletdb.js index edf83db8..7fdb9ce3 100644 --- a/lib/wallet/walletdb.js +++ b/lib/wallet/walletdb.js @@ -60,7 +60,7 @@ function WalletDB(options) { this.options = new WalletOptions(options); this.network = this.options.network; - this.logger = this.options.logger; + this.logger = this.options.logger.context('wallet'); this.client = this.options.client; this.db = LDB(this.options); this.rpc = new RPC(this);