From 9904b4ef5a3d942c97e0585a9f1e4a5ddc7de8e6 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 11 Aug 2016 13:59:14 -0700 Subject: Add ability to hide logging messages in production. --- app/scripts/metamask-controller.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/scripts/metamask-controller.js') diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index dd43ac2fc..a5c167223 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -7,6 +7,7 @@ const HostStore = require('./lib/remote-store.js').HostStore const Web3 = require('web3') const ConfigManager = require('./lib/config-manager') const extension = require('./lib/extension') +const developmentMode = require('./config').developmentMode module.exports = class MetamaskController { @@ -93,7 +94,7 @@ module.exports = class MetamaskController { function logger (err, request, response) { if (err) return console.error(err) - if (!request.isMetamaskInternal) { + if (developmentMode && !request.isMetamaskInternal) { console.log(`RPC (${originDomain}):`, request, '->', response) if (response.error) { console.error('Error in RPC response:\n', response.error) @@ -218,7 +219,9 @@ module.exports = class MetamaskController { // Log blocks processBlock (block) { - console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`) + if (developmentMode) { + console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`) + } this.verifyNetwork() } -- cgit v1.2.3 From 243d83dd336de01644f3d4ec00f49aa22b641005 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 11 Aug 2016 14:24:35 -0700 Subject: Separate developmentMode conditional to only wrap log. --- app/scripts/metamask-controller.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/scripts/metamask-controller.js') diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index ac0f32117..269bc5afd 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -94,8 +94,10 @@ module.exports = class MetamaskController { function logger (err, request, response) { if (err) return console.error(err) - if (developmentMode && !request.isMetamaskInternal) { - console.log(`RPC (${originDomain}):`, request, '->', response) + if (!request.isMetamaskInternal) { + if (developmentMode) { + console.log(`RPC (${originDomain}):`, request, '->', response) + } if (response.error) { console.error('Error in RPC response:\n', response.error) } -- cgit v1.2.3 From 2b0c6953e27b937d8ff75aad00786e3501599a73 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 11 Aug 2016 18:58:23 -0700 Subject: Create global variable that changes ui logging. --- app/scripts/metamask-controller.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'app/scripts/metamask-controller.js') diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 269bc5afd..e7e96a472 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -7,7 +7,6 @@ const HostStore = require('./lib/remote-store.js').HostStore const Web3 = require('web3') const ConfigManager = require('./lib/config-manager') const extension = require('./lib/extension') -const developmentMode = require('./config').developmentMode module.exports = class MetamaskController { @@ -95,9 +94,7 @@ module.exports = class MetamaskController { function logger (err, request, response) { if (err) return console.error(err) if (!request.isMetamaskInternal) { - if (developmentMode) { - console.log(`RPC (${originDomain}):`, request, '->', response) - } + console.log(`RPC (${originDomain}):`, request, '->', response) if (response.error) { console.error('Error in RPC response:\n', response.error) } @@ -221,9 +218,7 @@ module.exports = class MetamaskController { // Log blocks processBlock (block) { - if (developmentMode) { - console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`) - } + console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`) this.verifyNetwork() } -- cgit v1.2.3 From b1f68ec9cd2549a7b52272407f1543ae0b1d9326 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 11 Aug 2016 19:44:59 -0700 Subject: Add global var for background. --- app/scripts/metamask-controller.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/scripts/metamask-controller.js') diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index e7e96a472..2c141a402 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -94,7 +94,9 @@ module.exports = class MetamaskController { function logger (err, request, response) { if (err) return console.error(err) if (!request.isMetamaskInternal) { - console.log(`RPC (${originDomain}):`, request, '->', response) + if (global.METAMASK_DEBUG) { + console.log(`RPC (${originDomain}):`, request, '->', response) + } if (response.error) { console.error('Error in RPC response:\n', response.error) } @@ -218,7 +220,9 @@ module.exports = class MetamaskController { // Log blocks processBlock (block) { - console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`) + if (global.METAMASK_DEBUG) { + console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`) + } this.verifyNetwork() } -- cgit v1.2.3