diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 6b61141..935bc76 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,6 +1,12 @@ { "ExpandedNodes": [ - "" + "", + "\\resources\\windows", + "\\src", + "\\src\\common\\servers", + "\\src\\main", + "\\src\\main\\app" ], + "SelectedNode": "\\package.json", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/mattermost-desktop/FileContentIndex/861d4109-ae39-47e7-890f-91bda3137c06.vsidx b/.vs/mattermost-desktop/FileContentIndex/861d4109-ae39-47e7-890f-91bda3137c06.vsidx new file mode 100644 index 0000000..ba07a5a Binary files /dev/null and b/.vs/mattermost-desktop/FileContentIndex/861d4109-ae39-47e7-890f-91bda3137c06.vsidx differ diff --git a/.vs/mattermost-desktop/FileContentIndex/9a24d46d-cb36-4990-894d-4831603f53e6.vsidx b/.vs/mattermost-desktop/FileContentIndex/9a24d46d-cb36-4990-894d-4831603f53e6.vsidx deleted file mode 100644 index 70aef67..0000000 Binary files a/.vs/mattermost-desktop/FileContentIndex/9a24d46d-cb36-4990-894d-4831603f53e6.vsidx and /dev/null differ diff --git a/.vs/mattermost-desktop/FileContentIndex/79362703-0917-48b5-a01d-3dba9966dd4b.vsidx b/.vs/mattermost-desktop/FileContentIndex/b690b798-be9a-42e6-931b-7cf7a010b573.vsidx similarity index 100% rename from .vs/mattermost-desktop/FileContentIndex/79362703-0917-48b5-a01d-3dba9966dd4b.vsidx rename to .vs/mattermost-desktop/FileContentIndex/b690b798-be9a-42e6-931b-7cf7a010b573.vsidx diff --git a/.vs/mattermost-desktop/FileContentIndex/45c7da87-0af4-4b6f-8e82-f2a41513dcb5.vsidx b/.vs/mattermost-desktop/FileContentIndex/e21f5d8c-f635-474a-9494-9c476f8dfb13.vsidx similarity index 57% rename from .vs/mattermost-desktop/FileContentIndex/45c7da87-0af4-4b6f-8e82-f2a41513dcb5.vsidx rename to .vs/mattermost-desktop/FileContentIndex/e21f5d8c-f635-474a-9494-9c476f8dfb13.vsidx index 470ea97..4e07f9c 100644 Binary files a/.vs/mattermost-desktop/FileContentIndex/45c7da87-0af4-4b6f-8e82-f2a41513dcb5.vsidx and b/.vs/mattermost-desktop/FileContentIndex/e21f5d8c-f635-474a-9494-9c476f8dfb13.vsidx differ diff --git a/.vs/mattermost-desktop/v17/.wsuo b/.vs/mattermost-desktop/v17/.wsuo index 162439b..13cb157 100644 Binary files a/.vs/mattermost-desktop/v17/.wsuo and b/.vs/mattermost-desktop/v17/.wsuo differ diff --git a/.vs/mattermost-desktop/v17/workspaceFileList.bin b/.vs/mattermost-desktop/v17/workspaceFileList.bin index 2ece9a4..5b83135 100644 Binary files a/.vs/mattermost-desktop/v17/workspaceFileList.bin and b/.vs/mattermost-desktop/v17/workspaceFileList.bin differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index dc21d1f..b9f2285 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/.vscode/settings.json b/.vscode/settings.json index e462d21..71a3fde 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -51,5 +51,6 @@ "xvfb", "Yuya" ], - "i18n-ally.keystyle": "nested" + "i18n-ally.keystyle": "nested", + "makefile.configureOnOpen": false } diff --git a/release/11.0.4/mattermost-desktop-11.0.4-win-arm64.zip b/release/11.0.4/mattermost-desktop-11.0.4-win-arm64.zip index a815605..a3ccdaa 100644 Binary files a/release/11.0.4/mattermost-desktop-11.0.4-win-arm64.zip and b/release/11.0.4/mattermost-desktop-11.0.4-win-arm64.zip differ diff --git a/release/11.0.4/mattermost-desktop-11.0.4-win-x64.zip b/release/11.0.4/mattermost-desktop-11.0.4-win-x64.zip index 8d60be1..4741fc2 100644 Binary files a/release/11.0.4/mattermost-desktop-11.0.4-win-x64.zip and b/release/11.0.4/mattermost-desktop-11.0.4-win-x64.zip differ diff --git a/release/win-arm64-unpacked/resources/app.asar b/release/win-arm64-unpacked/resources/app.asar index a0cbe0c..10bceaa 100644 Binary files a/release/win-arm64-unpacked/resources/app.asar and b/release/win-arm64-unpacked/resources/app.asar differ diff --git a/release/win-unpacked/resources/app.asar b/release/win-unpacked/resources/app.asar index fc6bc78..15e2eeb 100644 Binary files a/release/win-unpacked/resources/app.asar and b/release/win-unpacked/resources/app.asar differ diff --git a/src/main/app/app.ts b/src/main/app/app.ts index 0860cb4..87a8790 100644 --- a/src/main/app/app.ts +++ b/src/main/app/app.ts @@ -24,7 +24,7 @@ const log = new Logger('App.App'); // app event handlers // -setInterval(monitorProcesses, 5000); +setInterval(monitorProcesses, 5000); // function added by ME // activate first app instance, subsequent instances will quit themselves export function handleAppSecondInstance(event: Event, argv: string[]) { diff --git a/src/main/processMonitor.ts b/src/main/processMonitor.ts index 18602db..929efc4 100644 --- a/src/main/processMonitor.ts +++ b/src/main/processMonitor.ts @@ -1,20 +1,24 @@ // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. import {exec} from 'child_process'; +import fs from 'fs'; + +const logFile: string = './process-monitor.log'; // Corrected declaration + +function logToFile(message: string) { + fs.appendFileSync(logFile, `${new Date().toISOString()} - ${message}\n`); +} export function monitorProcesses() { const command = process.platform === 'win32' ? 'tasklist' : 'ps aux'; exec(command, (error, stdout, stderr) => { if (error) { - // Handle error if needed + logToFile(`Error: ${error.message}`); return; } if (stderr) { - // Handle stderr if needed - + logToFile(`stderr: ${stderr}`); } - - // Process stdout (the list of running processes) - // You can do something with the stdout here, like parsing it or updating the UI + logToFile(`stdout: ${stdout}`); }); }