diff --git a/gui/daemon.js b/gui/daemon.js index dee8e5e2..1e334c23 100644 --- a/gui/daemon.js +++ b/gui/daemon.js @@ -17,12 +17,15 @@ const config = require(configPath); var daemon = new net.Socket(); var socketchunk = ''; // Current message, per connection. +// global to keep track of daemon connection error emissions +var daemonShowConnectStateError = 1 + setTimeout(connectDAEMON, 500) function connectDAEMON() { - - - daemonLog.info('connecting to daemon'); + if (daemonShowConnectStateError == 1) { + daemonLog.info('connecting to daemon'); + } //clear message buffer after reconnecting or inital connection socketchunk = ''; @@ -38,25 +41,30 @@ function connectDAEMON() { } daemon.on('connect', function(err) { - daemonLog.info('daemon connection established'); let Data = { daemon_connection: daemon.readyState, }; ipcRenderer.send('request-update-daemon-connection', Data); + daemonShowConnectStateError = 1 }) daemon.on('error', function(err) { - daemonLog.error('daemon connection error'); - daemonLog.error(err) + if (daemonShowConnectStateError == 1) { + daemonLog.error('daemon connection error'); + daemonLog.info('Make sure the daemon is started.'); + daemonLog.info('Run "python daemon.py" in the tnc directory.'); + daemonLog.debug(err) + + daemonShowConnectStateError = 0 + } + setTimeout(connectDAEMON, 500) daemon.destroy(); - setTimeout(connectDAEMON, 1000) let Data = { daemon_connection: daemon.readyState, }; ipcRenderer.send('request-update-daemon-connection', Data); - }); /* diff --git a/gui/sock.js b/gui/sock.js index 7c2061a3..96205302 100644 --- a/gui/sock.js +++ b/gui/sock.js @@ -21,12 +21,15 @@ var socketchunk = ''; // Current message, per connection. // split character const split_char = '\0;' -// globals for getting new data only if available so we are saving bandwith +// globals for getting new data only if available so we are saving bandwidth var rxBufferLengthTnc = 0 var rxBufferLengthGui = 0 var rxMsgBufferLengthTnc = 0 var rxMsgBufferLengthGui = 0 +// global to keep track of TNC connection error emissions +var tncShowConnectStateError = 1 + // network connection Timeout setTimeout(connectTNC, 2000) @@ -60,12 +63,20 @@ client.on('connect', function(data) { // also update tnc connection state ipcRenderer.send('request-update-tnc-connection', {tnc_connection : client.readyState}); - + tncShowConnectStateError = 1 }) client.on('error', function(data) { - socketLog.error('TNC connection error'); - socketLog.error(data); + if (tncShowConnectStateError == 1) { + socketLog.error('TNC connection error'); + socketLog.info('TNC is started by the GUI process.'); + socketLog.debug(data); + // setTimeout( function() { exports.connectTNC(tnc_host, tnc_port); }, 2000 ); + + tncShowConnectStateError = 0 + } + setTimeout(connectTNC, 500) + client.destroy(); let Data = { tnc_connection: client.readyState, busy_state: "-", @@ -79,10 +90,6 @@ client.on('error', function(data) { }; ipcRenderer.send('request-update-tnc-state', Data); ipcRenderer.send('request-update-tnc-connection', {tnc_connection : client.readyState}); - client.destroy(); - setTimeout(connectTNC, 1500) - // setTimeout( function() { exports.connectTNC(tnc_host, tnc_port); }, 2000 ); - }); /*