diff --git a/src/main/main.ts b/src/main/main.ts index af726e4d9245d67c33ad88cb5322eea46bfeea4b..45be6a10fa19279340033e0ffffce20e68369f4a 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -141,22 +141,22 @@ const startListeningToServerLog = async () => { ipcMain.on('serverLog:startListening', async (event) => { console.log('main.js: start listening'); - event.reply('serverLog:update', '**starting to listen to the log**'); - + event.reply( + 'serverLog:update', + '**Connecting to Terminal Output from Transformer Engine**' + ); + if (!tail.isWatching) { + tail.watch(); + } console.log('logFile', logFile); - - console.log(tail); - if (currentlySubscribed) { console.log('already watching'); return; } currentlySubscribed = true; - // tail.watch(); tail.on('line', function (data) { - // console.log(data); event.reply('serverLog:update', data); }); @@ -167,7 +167,10 @@ const startListeningToServerLog = async () => { ipcMain.on('serverLog:stopListening', async (event) => { console.log('main.js: stopping listening'); - event.reply('serverLog:update', '**Stopping listening to the log**'); + event.reply( + 'serverLog:update', + '**Disconnecting Terminal Output from Transformer Engine**' + ); tail.unwatch(); currentlySubscribed = false; }); diff --git a/src/renderer/components/Connect/LocalConnection.tsx b/src/renderer/components/Connect/LocalConnection.tsx index 1cae6b633d847ea62baedaa8583f3e7e22106646..0ee78cfe9e886a99b8d5f17c0503a747fe1e627d 100644 --- a/src/renderer/components/Connect/LocalConnection.tsx +++ b/src/renderer/components/Connect/LocalConnection.tsx @@ -971,10 +971,10 @@ function InstallStepper({ setServer }) { sx={{ flex: 2, backgroundColor: '#222', - color: 'white', fontFamily: 'monospace', p: 3, borderRadius: 10, + overflow: 'auto', }} > <LogViewer /> diff --git a/src/renderer/components/Connect/LogViewer.tsx b/src/renderer/components/Connect/LogViewer.tsx index c0885d1bbd4bfe6226a802fb51565ac05f0f91a4..406e37d0450573d8f320a0d63588c9dbb595ef5e 100644 --- a/src/renderer/components/Connect/LogViewer.tsx +++ b/src/renderer/components/Connect/LogViewer.tsx @@ -16,8 +16,10 @@ export default function LogViewer({}) { window.electron.ipcRenderer.sendMessage('serverLog:startListening'); }, 1500); window.electron.ipcRenderer.removeAllListeners('serverLog:onUpdate'); + console.log('Listening for server log updates'); window.electron.ipcRenderer.on('serverLog:update', (data: any) => { // append data to the log-viewer div + console.log('got data'); if (term != null) { term.writeln(`${data}`); }