Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only try to launch tnc binary if it exists.

Browse source
This commit is contained in:
Mashintime 2023-01-20 18:29:11 -05:00
parent fed4727a6c
commit 1ac9a1449d
1 changed files with 60 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
gui/main.js
View file

@ -316,105 +316,73 @@ app.whenReady().then(() => {
win.show(); win.show();
}, 3000); }, 3000);
// start daemon by checking os //Generate daemon binary path
mainLog.info('Starting freedata-daemon binary'); var daemonPath = "";
switch (os.platform().toLowerCase()){
case "darwin":
case "linux":
daemonPath = path.join(process.resourcesPath, 'tnc', 'freedata-daemon')
break;
case "win32":
case "win64":
daemonPath = path.join(process.resourcesPath, 'tnc', 'freedata-daemon.exe')
break;
default:
if(os.platform()=='darwin'){ break;
daemonProcess = spawn(path.join(process.resourcesPath, 'tnc', 'freedata-daemon'), [],
{
cwd: path.join(process.resourcesPath, 'tnc'),
});
}
/*
process.resourcesPath -->
/tmp/.mount_FreeDAUQYfKb/resources
__dirname -->
/tmp/.mount_FreeDAUQYfKb/resources/app.asar
*/
if(os.platform()=='linux'){
/*
var folder = path.join(process.resourcesPath, 'tnc');
//var folder = path.join(__dirname, 'extraResources', 'tnc');
console.log(folder);
fs.readdir(folder, (err, files) => {
console.log(files);
});
*/
daemonProcess = spawn(path.join(process.resourcesPath, 'tnc', 'freedata-daemon'), [],
{
cwd: path.join(process.resourcesPath, 'tnc'),
});
} }
//Start daemon binary if it exists
if(os.platform()=='win32' || os.platform()=='win64'){ if (fs.existsSync(daemonPath)){
// for windows the relative path via path.join(__dirname) is not needed for some reason mainLog.info('Starting freedata-daemon binary');
//daemonProcess = exec('\\tnc\\daemon.exe', []) daemonProcess = spawn(daemonPath,[],
{
daemonProcess = spawn(path.join(process.resourcesPath, 'tnc', 'freedata-daemon.exe'), [], cwd: path.join(daemonPath,".."),
{
cwd: path.join(process.resourcesPath, 'tnc'),
}); });
// return process messages
} daemonProcess.on('error', (err) => {
daemonProcessLog.error(`error when starting daemon: ${err}`);
// return process messages });
daemonProcess.on('message', (data) => {
daemonProcess.on('error', (err) => { daemonProcessLog.info(`${data}`);
daemonProcessLog.error(`error when starting daemon: ${err}`); });
}); daemonProcess.stdout.on('data', (data) => {
daemonProcessLog.info(`${data}`);
daemonProcess.on('message', (data) => { });
daemonProcessLog.info(`${data}`); daemonProcess.stderr.on('data', (data) => {
}); daemonProcessLog.info(`${data}`);
daemonProcess.stdout.on('data', (data) => {
daemonProcessLog.info(`${data}`);
});
daemonProcess.stderr.on('data', (data) => {
daemonProcessLog.info(`${data}`);
let arg = { let arg = {
entry: `${data}` entry: `${data}`
}; };
// send info to log only if log screen available // send info to log only if log screen available
// it seems an error occurs when updating // it seems an error occurs when updating
if (logViewer !== null && logViewer !== ''){ if (logViewer !== null && logViewer !== ''){
try{ try{
logViewer.webContents.send('action-update-log', arg); logViewer.webContents.send('action-update-log', arg);
} catch (e) { } catch (e) {
// empty for keeping error stuff silent // empty for keeping error stuff silent
// this is important to avoid error messages if we are going to close the app while // this is important to avoid error messages if we are going to close the app while
// an logging information will be pushed to the logger // an logging information will be pushed to the logger
}
} }
} });
daemonProcess.on('close', (code) => {
}); daemonProcessLog.warn(`daemonProcess exited with code ${code}`);
});
} else {
daemonProcess=null;
daemonPath=null;
mainLog.info("Daemon binary doesn't exist--normal for dev environments.")
}
});
daemonProcess.on('close', (code) => { app.on('activate', () => {
daemonProcessLog.warn(`daemonProcess exited with code ${code}`); if (BrowserWindow.getAllWindows().length === 0) {
}); createWindow();
}
app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) {
createWindow();
}
})
}) })
app.on('window-all-closed', () => { app.on('window-all-closed', () => {
close_all(); close_all();
@ -782,7 +750,8 @@ function close_sub_processes(){
// closing the tnc binary if not closed when closing application and also our daemon which has been started by the gui // closing the tnc binary if not closed when closing application and also our daemon which has been started by the gui
try { try {
daemonProcess.kill(); if (daemonProcess != null)
daemonProcess.kill();
} catch (e) { } catch (e) {
mainLog.error(e) mainLog.error(e)
} }