From 26e178f91c2083a25b122fb9ac70b5335bc695cc Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Sat, 17 Sep 2016 12:28:26 -0400 Subject: [PATCH] adjust monitor and improve error msgs --- lib/blockchain.js | 3 ++- lib/deploy.js | 9 +++++---- lib/monitor.js | 14 ++++++++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/blockchain.js b/lib/blockchain.js index 6080bfd7a..9beee684b 100644 --- a/lib/blockchain.js +++ b/lib/blockchain.js @@ -105,7 +105,8 @@ Blockchain.prototype.generate_basic_command = function() { cmd += "--rpcport " + this.blockchainConfig.rpcPort + " "; cmd += "--rpcaddr " + this.blockchainConfig.rpcHost + " "; cmd += "--networkid " + "12301" + " "; - cmd += "--rpccorsdomain=\"" + "localhost" + "\" "; + //cmd += "--rpccorsdomain=\"" + "localhost" + "\" "; + cmd += "--rpccorsdomain=\"" + "*" + "\" "; //cmd += "--port " + config.port + " "; //cmd += "--rpc "; diff --git a/lib/deploy.js b/lib/deploy.js index cfb0e31d8..bd88d38b4 100644 --- a/lib/deploy.js +++ b/lib/deploy.js @@ -22,7 +22,8 @@ Deploy.prototype.deployContract = function(contract, params, callback) { contractParams.push(function(err, transaction) { if (err) { - self.logger.info("error"); + self.logger.error("error deploying contract: " + contract.className); + self.logger.error(err.toString()); callback(new Error(err)); } else if (transaction.address !== undefined) { self.logger.info("address contract: " + transaction.address); @@ -36,16 +37,16 @@ Deploy.prototype.deployContract = function(contract, params, callback) { Deploy.prototype.deployAll = function(done) { var self = this; - this.logger.info("deployAll"); + this.logger.info("deploying contracts"); async.eachOfSeries(this.contractsManager.listContracts(), function(contract, key, callback) { - self.logger.info(arguments); + self.logger.trace(arguments); self.deployContract(contract, null, callback); }, function(err, results) { self.logger.info("finished"); - self.logger.info(arguments); + self.logger.trace(arguments); done(); } ); diff --git a/lib/monitor.js b/lib/monitor.js index 0a35f07d3..e663a504e 100644 --- a/lib/monitor.js +++ b/lib/monitor.js @@ -33,6 +33,12 @@ function Dashboard(options) { }); this.status.setContent(this.env); + this.operations.setContent('Ready'); + this.progress.setContent([ + 'geth (Ethereum)'.green, + 'whisper'.green, + 'IPFS'.green + ].join('\n')); this.moduleTable.setData([ ["Contract Name", "Address", "Status"], ["SimpleStorage", "0x123", "Deployed".green] @@ -191,7 +197,7 @@ Dashboard.prototype.layoutStatus = function() { left: 1, }, width: "100%", - height: "25%", + height: "20%", valign: "middle", border: { type: "line", @@ -212,7 +218,7 @@ Dashboard.prototype.layoutStatus = function() { left: 1, }, width: "100%", - height: "25%", + height: "20%", valign: "middle", border: { type: "line", @@ -233,8 +239,8 @@ Dashboard.prototype.layoutStatus = function() { left: 1, } : 1, width: "100%", - height: "58%", - valign: "middle", + height: "60%", + valign: "top", border: { type: "line", },