lukechilds
/
Agama
mirror of https://github.com/lukechilds/Agama.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

passive kmd main start

all-modes
pbca26 7 years ago
parent
35985e8987
commit
8b8eac0905
2 changed files with 77 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      gui/startup/index.html
  2. 25
      routes/shepherd.js

5
gui/startup/index.html
View File

@ -13,7 +13,7 @@
<script type="text/javascript" src="../EasyDEX-GUI/assets/mainWindow/js/jRoll.min.js"></script> <script type="text/javascript" src="../EasyDEX-GUI/assets/mainWindow/js/jRoll.min.js"></script>
<script>if (window.module) module = window.module;</script> <script>if (window.module) module = window.module;</script>
</head> </head>
<body class="agamaMode"> <body class="agamaMode loading-window">
<div class="text-center"> <div class="text-center">
<div id="agamaMode"> <div id="agamaMode">
<div <div
@ -47,6 +47,9 @@
<li onClick="closeMainWindow(null, true)"> <li onClick="closeMainWindow(null, true)">
<a>Custom</a> <a>Custom</a>
</li> </li>
<li onClick="startKMDPassive()">
<a>KMD (passive)</a>
</li>
</ul> </ul>
<button <button
id="normalStartBtn" id="normalStartBtn"

25
routes/shepherd.js
View File

@ -98,14 +98,15 @@ shepherd.defaultAppConfig = Object.assign({}, shepherd.appConfig);
shepherd.coindInstanceRegistry = coindInstanceRegistry; shepherd.coindInstanceRegistry = coindInstanceRegistry;
shepherd.startKMDNative = function(selection) { shepherd.startKMDNative = function(selection, isManual) {
if (selection === 'KMD') { if (selection === 'KMD') {
const herdData = { const herdData = {
'ac_name': 'komodod', 'ac_name': 'komodod',
'ac_options': [ 'ac_options': [
'-daemon=0', '-daemon=0',
'-addnode=78.47.196.146', '-addnode=78.47.196.146',
] ],
'manualStart': isManual,
}; };
const options = { const options = {
@ -2312,6 +2313,7 @@ shepherd.post('/herd', function(req, res) {
console.log('======= req.body ======='); console.log('======= req.body =======');
console.log(req.body); console.log(req.body);
if (!req.body.options.manualStart) {
function testCoindPort() { function testCoindPort() {
if (!lockDownAddCoin) { if (!lockDownAddCoin) {
const _port = assetChainPorts[req.body.options.ac_name]; const _port = assetChainPorts[req.body.options.ac_name];
@ -2362,6 +2364,16 @@ shepherd.post('/herd', function(req, res) {
result: 'result', result: 'result',
}; };
res.end(JSON.stringify(obj));
}
} else {
herder(req.body.herd, req.body.options);
const obj = {
msg: 'success',
result: 'result',
};
res.end(JSON.stringify(obj)); res.end(JSON.stringify(obj));
} }
}); });
@ -2790,10 +2802,11 @@ function herder(flock, data) {
console.log(`daemon param ${data.ac_custom_param}`); console.log(`daemon param ${data.ac_custom_param}`);
coindInstanceRegistry[data.ac_name] = true; coindInstanceRegistry[data.ac_name] = true;
if (!data.manualStart) {
let _arg = `${coindACParam}${data.ac_options.join(' ')}${_customParam}`; let _arg = `${coindACParam}${data.ac_options.join(' ')}${_customParam}`;
_arg = _arg.trim().split(' '); _arg = _arg.trim().split(' ');
execFile(`${komododBin}`, _arg, { execFile(`${komododBin}`, _arg, {
maxBuffer: 1024 * 10000 // 10 mb maxBuffer: 1024 * 500000 // 500 mb
}, function(error, stdout, stderr) { }, function(error, stdout, stderr) {
shepherd.writeLog(`stdout: ${stdout}`); shepherd.writeLog(`stdout: ${stdout}`);
shepherd.writeLog(`stderr: ${stderr}`); shepherd.writeLog(`stderr: ${stderr}`);
@ -2806,12 +2819,16 @@ function herder(flock, data) {
cache.io.emit('service', { cache.io.emit('service', {
komodod: { komodod: {
error: 'run -reindex', error: 'run -reindex',
} },
}); });
} }
} }
}); });
}
} else { } else {
if (data.manualStart) {
coindInstanceRegistry[data.ac_name] = true;
}
console.log(`port ${_port} (${data.ac_name}) is already in use`); console.log(`port ${_port} (${data.ac_name}) is already in use`);
shepherd.writeLog(`port ${_port} (${data.ac_name}) is already in use`); shepherd.writeLog(`port ${_port} (${data.ac_name}) is already in use`);
} }

Write Preview
Loading…
Cancel
Save