mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
moved rigctld binary check to socket check
This commit is contained in:
parent
232c10bf5f
commit
871c6c1756
2 changed files with 31 additions and 47 deletions
61
gui/main.js
61
gui/main.js
|
@ -16,6 +16,8 @@ const log = require('electron-log');
|
|||
const mainLog = log.scope('main');
|
||||
const daemonProcessLog = log.scope('freedata-daemon');
|
||||
const mime = require('mime');
|
||||
const net = require('net');
|
||||
|
||||
|
||||
const sysInfo = log.scope('system information');
|
||||
sysInfo.info("SYSTEM INFORMATION ----------------------------- ");
|
||||
|
@ -857,57 +859,30 @@ ipcMain.on('request-stop-rigctld',(event,data)=>{
|
|||
|
||||
|
||||
|
||||
// CHECK RIGCTLD
|
||||
ipcMain.on('request-check-rigctld',(data)=>{
|
||||
// CHECK RIGCTLD CONNECTION
|
||||
ipcMain.on('request-check-rigctld',(event, data)=>{
|
||||
|
||||
try{
|
||||
|
||||
try {
|
||||
let Data = {
|
||||
state: "unknown",
|
||||
};
|
||||
|
||||
isRunning('rigctld', (status) => {
|
||||
if (status){
|
||||
Data["state"] = "running";
|
||||
} else {
|
||||
Data["state"] = "unknown/stopped";
|
||||
}
|
||||
if (win !== null && win !== ''){
|
||||
var rigctld = new net.Socket();
|
||||
rigctld.connect(data.port, data.ip)
|
||||
|
||||
rigctld.on('error', function(err) {
|
||||
Data["state"] = "unknown/stopped - (" + data.ip + ":" + data.port + ")";
|
||||
win.webContents.send('action-check-rigctld', Data);
|
||||
}
|
||||
})
|
||||
|
||||
} catch (e) {
|
||||
mainLog.error(e)
|
||||
rigctld.on('connect', function(err) {
|
||||
Data["state"] = "connection possible - (" + data.ip + ":" + data.port + ")";
|
||||
win.webContents.send('action-check-rigctld', Data);
|
||||
})
|
||||
|
||||
} catch(e) {
|
||||
console.log(e)
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
// https://stackoverflow.com/a/51084163
|
||||
// Function for checking if a process is running or not
|
||||
/*
|
||||
isRunning('rigctld', (status) => {
|
||||
if (status){
|
||||
Data["state"] = "running";
|
||||
} else {
|
||||
Data["state"] = "unknown";
|
||||
}
|
||||
win.webContents.send('action-check-rigctld', Data);
|
||||
})
|
||||
*/
|
||||
const isRunning = (query, cb) => {
|
||||
let platform = process.platform;
|
||||
let cmd = '';
|
||||
switch (platform) {
|
||||
case 'win32' : cmd = `tasklist`; break;
|
||||
case 'darwin' : cmd = `ps -ax | grep ${query}`; break;
|
||||
case 'linux' : cmd = `ps -A`; break;
|
||||
default: break;
|
||||
}
|
||||
exec(cmd, (err, stdout) => {
|
||||
cb(stdout.toLowerCase().indexOf(query.toLowerCase()) > -1);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -2306,8 +2306,17 @@ function set_setting_switch(setting_switch, enable_object, state){
|
|||
|
||||
setInterval(checkRigctld, 500)
|
||||
function checkRigctld(){
|
||||
ipcRenderer.send('request-check-rigctld');
|
||||
|
||||
var rigctld_ip = document.getElementById("hamlib_rigctld_ip").value;
|
||||
var rigctld_port = document.getElementById("hamlib_rigctld_port").value;
|
||||
|
||||
let Data = {
|
||||
ip: rigctld_ip,
|
||||
port: rigctld_port
|
||||
};
|
||||
ipcRenderer.send('request-check-rigctld', Data);
|
||||
}
|
||||
|
||||
ipcRenderer.on('action-check-rigctld', (event, data) => {
|
||||
console.log(data)
|
||||
document.getElementById("hamlib_rigctld_status").value = data["state"];
|
||||
|
|
Loading…
Reference in a new issue