embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

adjust monitor and improve error msgs

This commit is contained in:
Iuri Matias 2016-09-17 12:28:26 -04:00
parent ea0ea6599e
commit 26e178f91c
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/blockchain.js
View File

@ -105,7 +105,8 @@ Blockchain.prototype.generate_basic_command = function() {
cmd += "--rpcport " + this.blockchainConfig.rpcPort + " "; cmd += "--rpcport " + this.blockchainConfig.rpcPort + " ";
cmd += "--rpcaddr " + this.blockchainConfig.rpcHost + " "; cmd += "--rpcaddr " + this.blockchainConfig.rpcHost + " ";
cmd += "--networkid " + "12301" + " "; cmd += "--networkid " + "12301" + " ";
cmd += "--rpccorsdomain=\"" + "localhost" + "\" "; //cmd += "--rpccorsdomain=\"" + "localhost" + "\" ";
cmd += "--rpccorsdomain=\"" + "*" + "\" ";
//cmd += "--port " + config.port + " "; //cmd += "--port " + config.port + " ";
//cmd += "--rpc "; //cmd += "--rpc ";

9
lib/deploy.js
View File

@ -22,7 +22,8 @@ Deploy.prototype.deployContract = function(contract, params, callback) {
contractParams.push(function(err, transaction) { contractParams.push(function(err, transaction) {
if (err) { if (err) {
self.logger.info("error"); self.logger.error("error deploying contract: " + contract.className);
self.logger.error(err.toString());
callback(new Error(err)); callback(new Error(err));
} else if (transaction.address !== undefined) { } else if (transaction.address !== undefined) {
self.logger.info("address contract: " + transaction.address); self.logger.info("address contract: " + transaction.address);
@ -36,16 +37,16 @@ Deploy.prototype.deployContract = function(contract, params, callback) {
Deploy.prototype.deployAll = function(done) { Deploy.prototype.deployAll = function(done) {
var self = this; var self = this;
this.logger.info("deployAll"); this.logger.info("deploying contracts");
async.eachOfSeries(this.contractsManager.listContracts(), async.eachOfSeries(this.contractsManager.listContracts(),
function(contract, key, callback) { function(contract, key, callback) {
self.logger.info(arguments); self.logger.trace(arguments);
self.deployContract(contract, null, callback); self.deployContract(contract, null, callback);
}, },
function(err, results) { function(err, results) {
self.logger.info("finished"); self.logger.info("finished");
self.logger.info(arguments); self.logger.trace(arguments);
done(); done();
} }
); );

14
lib/monitor.js
View File

@ -33,6 +33,12 @@ function Dashboard(options) {
}); });
this.status.setContent(this.env); this.status.setContent(this.env);
this.operations.setContent('Ready');
this.progress.setContent([
'geth (Ethereum)'.green,
'whisper'.green,
'IPFS'.green
].join('\n'));
this.moduleTable.setData([ this.moduleTable.setData([
["Contract Name", "Address", "Status"], ["Contract Name", "Address", "Status"],
["SimpleStorage", "0x123", "Deployed".green] ["SimpleStorage", "0x123", "Deployed".green]
@ -191,7 +197,7 @@ Dashboard.prototype.layoutStatus = function() {
left: 1, left: 1,
}, },
width: "100%", width: "100%",
height: "25%", height: "20%",
valign: "middle", valign: "middle",
border: { border: {
type: "line", type: "line",
@ -212,7 +218,7 @@ Dashboard.prototype.layoutStatus = function() {
left: 1, left: 1,
}, },
width: "100%", width: "100%",
height: "25%", height: "20%",
valign: "middle", valign: "middle",
border: { border: {
type: "line", type: "line",
@ -233,8 +239,8 @@ Dashboard.prototype.layoutStatus = function() {
left: 1, left: 1,
} : 1, } : 1,
width: "100%", width: "100%",
height: "58%", height: "60%",
valign: "middle", valign: "top",
border: { border: {
type: "line", type: "line",
}, },