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/config.js | 3 ++- app/scripts/metamask-controller.js | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/scripts/config.js b/app/scripts/config.js index 5f6ffd936..297a3a7a0 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -2,6 +2,7 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/' const TESTNET_RPC_URL = 'https://morden.infura.io/' const DEFAULT_RPC_URL = TESTNET_RPC_URL const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/' +const DEVELOPMENT_MODE = true module.exports = { network: { @@ -10,5 +11,5 @@ module.exports = { testnet: TESTNET_RPC_URL, classic: CLASSIC_RPC_URL, }, + developmentMode: DEVELOPMENT_MODE } - 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 From 804e8df87f6ccd4cad62c659022c00791a3921e9 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 11 Aug 2016 14:03:51 -0700 Subject: Lint --- app/scripts/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/scripts/config.js b/app/scripts/config.js index 297a3a7a0..ce0ba7a01 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -11,5 +11,5 @@ module.exports = { testnet: TESTNET_RPC_URL, classic: CLASSIC_RPC_URL, }, - developmentMode: DEVELOPMENT_MODE + developmentMode: DEVELOPMENT_MODE, } -- cgit 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') 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 From b8856d765daeb9c3b5be9a3067f977d85222639c Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 11 Aug 2016 15:42:21 -0700 Subject: Setting defaults to production. --- app/scripts/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/scripts/config.js b/app/scripts/config.js index ce0ba7a01..620872249 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -2,7 +2,7 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/' const TESTNET_RPC_URL = 'https://morden.infura.io/' const DEFAULT_RPC_URL = TESTNET_RPC_URL const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/' -const DEVELOPMENT_MODE = true +const DEVELOPMENT_MODE = false module.exports = { network: { -- cgit 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/config.js | 2 -- app/scripts/metamask-controller.js | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'app') diff --git a/app/scripts/config.js b/app/scripts/config.js index 620872249..ba012c6b8 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -2,7 +2,6 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/' const TESTNET_RPC_URL = 'https://morden.infura.io/' const DEFAULT_RPC_URL = TESTNET_RPC_URL const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/' -const DEVELOPMENT_MODE = false module.exports = { network: { @@ -11,5 +10,4 @@ module.exports = { testnet: TESTNET_RPC_URL, classic: CLASSIC_RPC_URL, }, - developmentMode: DEVELOPMENT_MODE, } 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 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/background.js | 1 + app/scripts/config.js | 2 ++ app/scripts/lib/idStore.js | 9 ++++++--- app/scripts/metamask-controller.js | 8 ++++++-- 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/scripts/background.js b/app/scripts/background.js index 34c994ab7..e04309e74 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -13,6 +13,7 @@ const extension = require('./lib/extension') const STORAGE_KEY = 'metamask-config' + const controller = new MetamaskController({ // User confirmation callbacks: showUnconfirmedMessage, diff --git a/app/scripts/config.js b/app/scripts/config.js index ba012c6b8..7a1d54a3b 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -3,6 +3,8 @@ const TESTNET_RPC_URL = 'https://morden.infura.io/' const DEFAULT_RPC_URL = TESTNET_RPC_URL const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/' +global.METAMASK_DEBUG = false + module.exports = { network: { default: DEFAULT_RPC_URL, diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index c6ac55a03..f63e03ec6 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -153,8 +153,9 @@ IdentityStore.prototype.getNetwork = function (err) { this._currentState.network = 'loading' return this._didUpdate() } - - console.log('web3.getNetwork returned ' + network) + if (global.METAMASK_DEBUG) { + console.log('web3.getNetwork returned ' + network) + } this._currentState.network = network this._didUpdate() }) @@ -475,7 +476,9 @@ IdentityStore.prototype._restoreFromSeed = function (password, seed, derivedKey) keyStore.generateNewAddress(derivedKey, 3) configManager.setWallet(keyStore.serialize()) - console.log('restored from seed. saved to keystore') + if (global.METAMASK_DEBUG) { + console.log('restored from seed. saved to keystore') + } return keyStore } 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