diff --git a/gui/index.html b/gui/index.html
index 09eb078..5c6c9af 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -7,6 +7,7 @@
+
diff --git a/gui/init.js b/gui/init.js
index cbe133a..a55a4d3 100644
--- a/gui/init.js
+++ b/gui/init.js
@@ -11,13 +11,13 @@ $(document).ready(function() {
$('#loading_status_text').text('Starting Iguana daemon...');
- if (appConf && !appConf.manualIguanaStart) {
+ //if (appConf && !appConf.manualIguanaStart) {
StartIguana();
- }
+ //}
var portcheck;
- function sartcheck() {
+ function startcheck() {
portcheck = setInterval(function(){
Iguana_activehandle().then(function(result){
console.log(result);
@@ -37,5 +37,5 @@ $(document).ready(function() {
clearInterval(portcheck);
}
- sartcheck();
+ startcheck();
});
\ No newline at end of file
diff --git a/gui/loading.js b/gui/loading.js
index d75532b..fe5146c 100644
--- a/gui/loading.js
+++ b/gui/loading.js
@@ -17,7 +17,7 @@ function Iguana_activehandle(callback) {
'agent': 'SuperNET',
'method': 'activehandle'
},
- AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+ AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
//console.log(AjaxOutputData.responseText);
AjaxOutputData = JSON.parse(AjaxOutputData.responseText)
//console.log(AjaxOutputData);
@@ -31,7 +31,7 @@ function Iguana_activehandle(callback) {
console.log(textStatus);
console.log(error);
});
- });
+ });
}
//Iguana_activehandle().then(function(result){
//console.log(result)
@@ -95,7 +95,7 @@ function EDEX_DEXnotarychains() {
'agent': 'dpow',
'method': 'notarychains'
},
- AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+ AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
//console.log(AjaxOutputData.responseText);
AjaxOutputData = JSON.parse(AjaxOutputData.responseText);
//console.log(AjaxOutputData);
@@ -124,7 +124,7 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) {
'method': 'notarychains'
},
tmp_index = 0,
- get_dex_notarychains = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+ get_dex_notarychains = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
get_dex_notarychains = JSON.parse(get_dex_notarychains.responseText);
if (minNotaries > get_dex_notarychains.length) { // if config value exceeds total num of notaries
minNotaries = get_dex_notarychains.length;
@@ -144,7 +144,7 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) {
console.log(ajax_data);
if (coin_value !== 'MESH' || coin_value !== 'CEAL') {
- var getinfo_each_chain = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+ var getinfo_each_chain = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
getinfo_each_chain = JSON.parse(getinfo_each_chain.responseText);
console.log(getinfo_each_chain);
diff --git a/main.js b/main.js
index fda34a8..6fb9216 100644
--- a/main.js
+++ b/main.js
@@ -101,7 +101,7 @@ server.listen(appConfig.iguanaAppPort, function() {
console.log('guiapp and sockets.io are listening on port ' + appConfig.iguanaAppPort + '!');
});
-io.set('origins', 'http://127.0.0.1:17777'); // set origin
+io.set('origins', 'http://127.0.0.1:' + appConfig.iguanaAppPort); // set origin
io.on('connection', function(client) {
console.log('EDEX GUI is connected...');
diff --git a/routes/shepherd.js b/routes/shepherd.js
index d09adc0..2813504 100644
--- a/routes/shepherd.js
+++ b/routes/shepherd.js
@@ -87,6 +87,49 @@ shepherd.appConfig = {
}
};
+shepherd.loadLocalConfig = function() {
+ if (fs.existsSync(iguanaDir + '/config.json')) {
+ var localAppConfig = fs.readFileSync(iguanaDir + '/config.json', 'utf8');
+ console.log('app config set from local file');
+
+ // find diff between local and hardcoded configs
+ // append diff to local config
+ var compareJSON = function(obj1, obj2) {
+ var result = {};
+
+ for (var i in obj1) {
+ if (!obj2.hasOwnProperty(i)) {
+ result[i] = obj1[i];
+ }
+ }
+
+ return result;
+ };
+
+ var compareConfigs = compareJSON(shepherd.appConfig, JSON.parse(localAppConfig));
+ if (Object.keys(compareConfigs).length) {
+ var newConfig = Object.assign(JSON.parse(localAppConfig), compareConfigs);
+
+ console.log('config diff is found, updating local config');
+ console.log('config diff:');
+ console.log(compareConfigs);
+
+ shepherd.saveLocalAppConf(newConfig);
+ return newConfig;
+ } else {
+ return JSON.parse(localAppConfig);
+ }
+
+ } else {
+ console.log('local config file is not found!');
+ shepherd.saveLocalAppConf(shepherd.appConfig);
+
+ return shepherd.appConfig;
+ }
+};
+
+shepherd.appConfig = shepherd.loadLocalConfig();
+
console.log('iguana dir: ' + iguanaDir);
console.log('iguana bin: ' + iguanaBin);
console.log('--------------------------')
@@ -114,7 +157,7 @@ var mock = require('./mock');
// expose sockets obj
shepherd.setIO = function(io) {
shepherd.io = io;
- cache.setVar('io', io);
+ cache.setVar('io', io);
};
cache.setVar('iguanaDir', iguanaDir);
@@ -149,7 +192,7 @@ shepherd.delete('/groom', function(req, res, next) {
* params: filename, payload
*/
shepherd.post('/groom', function(req, res) {
- cache.groomPost(req, res, next);
+ cache.groomPost(req, res, next);
});
/*
@@ -465,47 +508,6 @@ shepherd.get('/kick', function(req, res, next) {
}
});
-shepherd.loadLocalConfig = function() {
- if (fs.existsSync(iguanaDir + '/config.json')) {
- var localAppConfig = fs.readFileSync(iguanaDir + '/config.json', 'utf8');
- console.log('app config set from local file');
-
- // find diff between local and hardcoded configs
- // append diff to local config
- var compareJSON = function(obj1, obj2) {
- var result = {};
-
- for (var i in obj1) {
- if (!obj2.hasOwnProperty(i)) {
- result[i] = obj1[i];
- }
- }
-
- return result;
- };
-
- var compareConfigs = compareJSON(shepherd.appConfig, JSON.parse(localAppConfig));
- if (Object.keys(compareConfigs).length) {
- var newConfig = Object.assign(JSON.parse(localAppConfig), compareConfigs);
-
- console.log('config diff is found, updating local config');
- console.log('config diff:');
- console.log(compareConfigs);
-
- shepherd.saveLocalAppConf(newConfig);
- return newConfig;
- } else {
- return JSON.parse(localAppConfig);
- }
-
- } else {
- console.log('local config file is not found!');
- shepherd.saveLocalAppConf(shepherd.appConfig);
-
- return shepherd.appConfig;
- }
-};
-
shepherd.readDebugLog = function(fileLocation, lastNLines) {
return new Promise(
function(resolve, reject) {
@@ -609,10 +611,12 @@ function herder(flock, data) {
process.exit(2);
}
+ console.log('iguana core port ' + shepherd.appConfig.iguanaCorePort);
pm2.start({
script: iguanaBin, // path to binary
name: 'IGUANA',
exec_mode : 'fork',
+ args: ['-port=' + shepherd.appConfig.iguanaCorePort],
cwd: iguanaDir //set correct iguana directory
}, function(err, apps) {
pm2.disconnect(); // Disconnect from PM2