m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Create global variable that changes ui logging.

Browse Source
This commit is contained in:
Kevin Serrano 2016-08-11 18:58:23 -07:00
parent b8856d765d
commit 2b0c6953e2
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/config.js
View File

@ -2,7 +2,6 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/'
const TESTNET_RPC_URL = 'https://morden.infura.io/' const TESTNET_RPC_URL = 'https://morden.infura.io/'
const DEFAULT_RPC_URL = TESTNET_RPC_URL const DEFAULT_RPC_URL = TESTNET_RPC_URL
const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/' const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/'
const DEVELOPMENT_MODE = false
module.exports = { module.exports = {
network: { network: {
@ -11,5 +10,4 @@ module.exports = {
testnet: TESTNET_RPC_URL, testnet: TESTNET_RPC_URL,
classic: CLASSIC_RPC_URL, classic: CLASSIC_RPC_URL,
}, },
developmentMode: DEVELOPMENT_MODE,
} }

5
app/scripts/metamask-controller.js
View File

@ -7,7 +7,6 @@ const HostStore = require('./lib/remote-store.js').HostStore
const Web3 = require('web3') const Web3 = require('web3')
const ConfigManager = require('./lib/config-manager') const ConfigManager = require('./lib/config-manager')
const extension = require('./lib/extension') const extension = require('./lib/extension')
const developmentMode = require('./config').developmentMode
module.exports = class MetamaskController { module.exports = class MetamaskController {
@ -95,9 +94,7 @@ module.exports = class MetamaskController {
function logger (err, request, response) { function logger (err, request, response) {
if (err) return console.error(err) if (err) return console.error(err)
if (!request.isMetamaskInternal) { if (!request.isMetamaskInternal) {
if (developmentMode) {
console.log(`RPC (${originDomain}):`, request, '->', response) console.log(`RPC (${originDomain}):`, request, '->', response)
}
if (response.error) { if (response.error) {
console.error('Error in RPC response:\n', response.error) console.error('Error in RPC response:\n', response.error)
} }
@ -221,9 +218,7 @@ module.exports = class MetamaskController {
// Log blocks // Log blocks
processBlock (block) { 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() this.verifyNetwork()
} }

5
ui/app/conversion-util.js Normal file
View File

File diff suppressed because one or more lines are too long

12
ui/app/store.js
View File

@ -2,17 +2,17 @@ const createStore = require('redux').createStore
const applyMiddleware = require('redux').applyMiddleware const applyMiddleware = require('redux').applyMiddleware
const thunkMiddleware = require('redux-thunk') const thunkMiddleware = require('redux-thunk')
const rootReducer = require('./reducers') const rootReducer = require('./reducers')
const developmentMode = require('../../app/scripts/config').developmentMode
const createLogger = require('redux-logger') const createLogger = require('redux-logger')
global.METAMASK_DEBUG = false
module.exports = configureStore module.exports = configureStore
const middlewares = [thunkMiddleware] const loggerMiddleware = createLogger({
predicate: () => global.METAMASK_DEBUG ? true : false
})
if (developmentMode) { const middlewares = [thunkMiddleware, loggerMiddleware]
const loggerMiddleware = createLogger()
middlewares.push(loggerMiddleware)
}
const createStoreWithMiddleware = applyMiddleware(...middlewares)(createStore) const createStoreWithMiddleware = applyMiddleware(...middlewares)(createStore)