Browse Source

exec to execFile switch

all-modes
pbca26 8 years ago
parent
commit
fc6d1c462f
  1. 39
      routes/shepherd.js

39
routes/shepherd.js

@ -21,7 +21,8 @@ const electron = require('electron'),
AdmZip = require('adm-zip'),
remoteFileSize = require('remote-file-size'),
Promise = require('bluebird'),
{shell} = require('electron');
{shell} = require('electron'),
{ execFile } = require('child_process');
const fixPath = require('fix-path');
var ps = require('ps-node'),
@ -906,8 +907,12 @@ shepherd.quitKomodod = function(timeout = 100) {
coindExitInterval[key] = setInterval(function() {
shepherd.killRogueProcess('komodo-cli');
console.log('exec ' + komodocliBin + (chain ? ' -ac_name=' + chain : '') + ' stop');
exec(komodocliBin + (chain ? ' -ac_name=' + chain : '') + ' stop', function(error, stdout, stderr) {
let _arg = [];
if (chain) {
_arg.push(`-ac_name=${chain}`);
}
_arg.push('stop');
execFile(`${komodocliBin}`, _arg, function(error, stdout, stderr) {
console.log(`stdout: ${stdout}`);
console.log(`stderr: ${stderr}`);
@ -1026,7 +1031,9 @@ shepherd.post('/cli', function(req, res, next) {
});
} else {
shepherd.killRogueProcess('komodo-cli');
exec(komodocliBin + (_chain ? ' -ac_name=' + _chain : '') + ' ' + _cmd + _params, function(error, stdout, stderr) {
let _arg = (_chain ? ' -ac_name=' + _chain : '') + ' ' + _cmd + _params;
_arg = _arg.trim().split(' ');
execFile(komodocliBin, _arg, function(error, stdout, stderr) {
console.log(`stdout: ${stdout}`);
console.log(`stderr: ${stderr}`);
@ -2132,7 +2139,9 @@ function herder(flock, data) {
console.log(`daemon param ${data.ac_custom_param}`);
coindInstanceRegistry[data.ac_name] = true;
exec(`${komododBin} ${coindACParam}${data.ac_options.join(' ')}${_customParam}`, {
let _arg = `${coindACParam}${data.ac_options.join(' ')}${_customParam}`;
_arg = _arg.trim().split(' ');
execFile(`${komododBin}`, _arg, {
maxBuffer: 1024 * 10000 // 10 mb
}, function(error, stdout, stderr) {
shepherd.writeLog(`stdout: ${stdout}`);
@ -2549,16 +2558,16 @@ function formatBytes(bytes, decimals) {
const k = 1000;
const dm = (decimals + 1) || 3;
const sizes = [
'Bytes',
'KB',
'MB',
'GB',
'TB',
'PB',
'EB',
'ZB',
'YB'
];
'Bytes',
'KB',
'MB',
'GB',
'TB',
'PB',
'EB',
'ZB',
'YB'
];
const i = Math.floor(Math.log(bytes) / Math.log(k));
return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`;

Loading…
Cancel
Save