zecfoundation
/
zepio
mirror of https://github.com/ZcashFoundation/zepio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(relaunch): increase interval on waitDaemonClose

This commit is contained in:
George Lima 2019-04-16 00:15:46 -03:00
parent 27bfbd4a3e
commit 40cb4364d4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/daemon/wait-for-daemon-close.js
View File

@ -10,7 +10,7 @@ export default (processName: string): Promise<void> => new Promise((resolve) =>
if (!isRunning) {
clearInterval(interval);
resolve();
setTimeout(resolve, 1000);
}
}, 500);
});

8
config/daemon/zcashd-child-process.js
View File

@ -46,7 +46,6 @@ const getDaemonOptions = ({
const defaultOptions = [
'-server=1',
'-rest=1',
'-showmetrics',
'--metricsui=0',
'-metricsrefreshtime=1',
@ -69,6 +68,7 @@ const ZCASHD_PROCESS_NAME = getDaemonName();
// eslint-disable-next-line
const runDaemon: () => Promise<?ChildProcess> = () => new Promise(async (resolve, reject) => {
const processName = path.join(getBinariesPath(), getOsFolder(), ZCASHD_PROCESS_NAME);
const isRelaunch = Boolean(process.argv.find(arg => arg === '--relaunch'));
if (!mainWindow.isDestroyed()) mainWindow.webContents.send('zcashd-params-download', 'Fetching params...');
@ -86,7 +86,7 @@ const runDaemon: () => Promise<?ChildProcess> = () => new Promise(async (resolve
// In case of --relaunch on argv, we need wait to close the old zcash daemon
// a workaround is use a interval to check if there is a old process running
if (process.argv.find(arg => arg === '--relaunch')) {
if (isRelaunch) {
await waitForDaemonClose(ZCASHD_PROCESS_NAME);
}
@ -137,7 +137,9 @@ const runDaemon: () => Promise<?ChildProcess> = () => new Promise(async (resolve
store.set(EMBEDDED_DAEMON, true);
store.set(ZCASH_NETWORK, optionsFromZcashConf.testnet === '1' ? TESTNET : MAINNET);
if (!isRelaunch) {
store.set(ZCASH_NETWORK, optionsFromZcashConf.testnet === '1' ? TESTNET : MAINNET);
}
if (!optionsFromZcashConf.rpcuser) store.set('rpcuser', uuid());
if (!optionsFromZcashConf.rpcpassword) store.set('rpcpassword', uuid());