status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

get rid of console logs and try reworking the undefined handling 

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
This commit is contained in:
VoR0220 2018-05-18 09:42:30 -05:00
parent 5af4eb5b25
commit bef490f5c7
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dashboard/console.js
View File

@ -39,29 +39,23 @@ class Console {
for (let pluginCmd of pluginCmds) {
let pluginOutput = pluginCmd.call(this, cmd, {});
//console.log("plugin output: ", pluginOutput)
if (pluginOutput !== false && pluginOutput !== 'false')
if (pluginOutput !== false && pluginOutput !== 'false' && pluginOutput !== undefined)
return callback(pluginOutput);
else if (pluginOutput === undefined)
return;
}
//console.log("Do we hit the here?")
let output = this.processEmbarkCmd(cmd);
console.log("Output: ", output);
if (output) {
return callback(output);
}
console.log("What about the here?")
try {
let result = RunCode.doEval(cmd);
console.log("RESULT: ", result)
return callback(result);
}
catch (e) {
if (e.message.indexOf('not defined') > 0) {
console.log("Hit here in indexOf")
return callback(("error: " + e.message).red + ("\n" + __("Type") + " " + "help".bold + " " + __("to see the list of available commands")).cyan);
} else {
console.log("Still hit the catch")
return callback(e.message);
}
}

5
lib/dashboard/monitor.js
View File

@ -367,9 +367,8 @@ class Dashboard {
executeCmd(cmd, cb) {
const self = this;
self.logText.log('console> '.bold.green + cmd);
self.console.executeCmd(cmd, function (result) {
if (result !== undefined)
self.logText.log(result);
self.console.executeCmd(cmd, function (result) {
self.logText.log(result);
if (cb) {
cb(result);
}