Browse Source

fixed pkill iguana, default notary node check set to 8, killi iguana on start set default to true

all-modes
Satinder Grewal 8 years ago
parent
commit
71d781c3fd
  1. 2
      gui/EasyDEX-GUI
  2. 6
      main.js
  3. 4
      routes/shepherd.js

2
gui/EasyDEX-GUI

@ -1 +1 @@
Subproject commit e94f97853cac23d16a0b5d9be31bf7fbfaa618c3 Subproject commit f9fa880e22966da80563306770392045e8eb5699

6
main.js

@ -40,10 +40,10 @@ var shepherd = require('./routes/shepherd'),
if (appConfig.killIguanaOnStart) { if (appConfig.killIguanaOnStart) {
var iguanaGrep; var iguanaGrep;
if (os.platform() === 'darwin') { if (os.platform() === 'darwin') {
iguanaGrep = "ps -p $(ps -A | grep -m1 iguana | awk '{print $1}')"; iguanaGrep = "ps -p $(ps -A | grep -m1 iguana | awk '{print $1}') | grep -i iguana";
} }
if (os.platform() === 'linux') { if (os.platform() === 'linux') {
iguanaGrep = 'ps -p $(pidof iguana)'; iguanaGrep = 'ps -p $(pidof iguana) | grep -i iguana';
} }
if (os.platform() === 'win32') { if (os.platform() === 'win32') {
iguanaGrep = 'tasklist'; iguanaGrep = 'tasklist';
@ -51,7 +51,7 @@ if (appConfig.killIguanaOnStart) {
exec(iguanaGrep, function(error, stdout, stderr) { exec(iguanaGrep, function(error, stdout, stderr) {
if (stdout.indexOf('iguana') > -1) { if (stdout.indexOf('iguana') > -1) {
console.log('found another iguana process(es)'); console.log('found another iguana process(es)');
var pkillCmd = os.platform() === 'win32' ? 'taskkill /f /im iguana.exe' : 'pkill iguana'; var pkillCmd = os.platform() === 'win32' ? 'taskkill /f /im iguana.exe' : 'pkill -9 iguana';
exec(pkillCmd, function(error, stdout, stderr) { exec(pkillCmd, function(error, stdout, stderr) {
console.log(pkillCmd + ' is issued'); console.log(pkillCmd + ' is issued');

4
routes/shepherd.js

@ -80,7 +80,7 @@ shepherd.appConfig = {
"iguanaGuiOnly": false, "iguanaGuiOnly": false,
"manualIguanaStart": false, "manualIguanaStart": false,
"skipBasiliskNetworkCheck": false, "skipBasiliskNetworkCheck": false,
"minNotaries": 50, "minNotaries": 8,
"host": "127.0.0.1", "host": "127.0.0.1",
"iguanaAppPort": 17777, "iguanaAppPort": 17777,
"iguanaCorePort": 7778, "iguanaCorePort": 7778,
@ -88,7 +88,7 @@ shepherd.appConfig = {
"darwin": 90000, "darwin": 90000,
"linux": 1000000 "linux": 1000000
}, },
"killIguanaOnStart": false, "killIguanaOnStart": true,
"dev": false "dev": false
}; };

Loading…
Cancel
Save