Browse Source

added missing async change

all-modes
pbca26 8 years ago
parent
commit
82de463b16
  1. 1
      gui/loading.js
  2. 80
      routes/shepherd.js

1
gui/loading.js

@ -71,7 +71,6 @@ function GetAppConf(cb) { // get iguana app conf
console.log(ajax_data);
$.ajax({
async: false,
type: 'GET',
url: 'http://127.0.0.1:17777/shepherd/appconf'
})

80
routes/shepherd.js

@ -322,9 +322,9 @@ shepherd.post('/herd', function(req, res) {
/*
*
*
* ajax_data = { 'command': 'getinfo' };
*
*
* console.log(ajax_data);
* $.ajax({
* async: false,
@ -342,7 +342,7 @@ shepherd.post('/herd', function(req, res) {
* console.log(error);
* }
* });
*
*
*/
/*shepherd.post('/kmdcli', function(req, res) {
console.log('======= req.body =======');
@ -422,7 +422,6 @@ shepherd.post('/setconf', function(req, res) {
setConf(req.body.chain);
}
var obj = {
'msg': 'success',
'result': 'result'
@ -619,9 +618,6 @@ shepherd.readDebugLog = function(fileLocation, lastNLines) {
};
function herder(flock, data) {
//console.log(flock);
//console.log(data);
if (data == undefined) {
data = 'none';
console.log('it is undefined');
@ -631,32 +627,6 @@ function herder(flock, data) {
console.log('iguana flock selected...');
console.log('selected data: ' + data);
//Make sure iguana isn't running before starting new process, kill it dammit!
// A simple pid lookup
/*ps.lookup({
command: 'iguana',
//arguments: '--debug',
}, function(err, resultList ) {
if (err) {
throw new Error( err );
}
resultList.forEach(function( process ){
if( process ){
console.log( 'PID: %s, COMMAND: %s, ARGUMENTS: %s', process.pid, process.command, process.arguments );
console.log(process.pid);
// A simple pid lookup
ps.kill( process.pid, function( err ) {
if (err) {
throw new Error( err );
}
else {
console.log( 'Process %s has been killed!', process.pid );
}
});
}
});
});*/
// MAKE SURE IGUANA DIR IS THERE FOR USER
mkdirp(iguanaDir, function(err) {
if (err)
@ -711,7 +681,7 @@ function herder(flock, data) {
}
if (flock === 'komodod') {
var kmdDebugLogLocation = komodoDir + '/debug.log';
var kmdDebugLogLocation = ( data.ac_name ? komodoDir + '/' + data.ac_name : komodoDir ) + '/debug.log';
console.log('komodod flock selected...');
console.log('selected data: ' + data);
@ -725,29 +695,33 @@ function herder(flock, data) {
fs.unlink(kmdDebugLogLocation);
}
});
} catch(err) {
console.log('komodod debug.log access err: ' + err);
} catch(e) {
console.log('komodod debug.log access err: ' + e);
}
pm2.connect(true, function(err) { // start up pm2 god
if (err) {
console.error(err);
process.exit(2);
}
try {
pm2.connect(true, function(err) { // start up pm2 god
if (err) {
console.error(err);
process.exit(2);
}
pm2.start({
script: komododBin, // path to binary
name: data.ac_name, // REVS, USD, EUR etc.
exec_mode : 'fork',
cwd: komodoDir,
args: data.ac_options
//args: ["-server", "-ac_name=USD", "-addnode=78.47.196.146"], //separate the params with commas
}, function(err, apps) {
pm2.disconnect(); // Disconnect from PM2
if (err)
throw err;
pm2.start({
script: komododBin, // path to binary
name: data.ac_name, // REVS, USD, EUR etc.
exec_mode : 'fork',
cwd: komodoDir,
args: data.ac_options
//args: ["-server", "-ac_name=USD", "-addnode=78.47.196.146"], //separate the params with commas
}, function(err, apps) {
pm2.disconnect(); // Disconnect from PM2
if (err)
throw err;
});
});
});
} catch(e) {
console.log('failed to start komodod err: ' + e);
}
}
if (flock === 'zcashd') {

Loading…
Cancel
Save