smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Move free functions to top of Windows watchdog source

Browse source
This commit is contained in:
Nick Bolton 2025-03-03 12:07:08 +00:00
parent 0f11b61576
commit 997d4a9473
1 changed files with 57 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/lib/platform/MSWindowsWatchdog.cpp
View file

@ -21,6 +21,63 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
//
// Free functions
//
std::string trimOutputBuffer(const CHAR *buffer)
{
// strip out windows \r chars to prevent extra lines in log file.
std::string output(buffer);
if (output.empty()) {
LOG_DEBUG1("output buffer is empty");
return output;
}
size_t pos = 0;
while ((pos = output.find("\r", pos)) != std::string::npos) {
output.replace(pos, 1, "");
}
// trip ending newline, as file writer will add it's own newline.
if (output[output.length() - 1] == '\n') {
output = output.substr(0, output.length() - 1);
}
return output;
}
HANDLE openProcessForKill(const PROCESSENTRY32 &entry)
{
// pid 0 is 'system idle process'
if (entry.th32ProcessID == 0)
return nullptr;
if (_stricmp(entry.szExeFile, "deskflow-client.exe") != 0 && //
_stricmp(entry.szExeFile, "deskflow-server.exe") != 0 && //
_stricmp(entry.szExeFile, "deskflow-core.exe") != 0) {
return nullptr;
}
HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID);
if (handle == nullptr) {
LOG((CLOG_ERR "could not open process handle for kill"));
throw XArch(new XArchEvalWindows);
}
// only shut down if not current process (daemon is now the same unified binary).
if (entry.th32ProcessID == GetCurrentProcessId()) {
CloseHandle(handle);
return nullptr;
}
return handle;
}
//
// MSWindowsWatchdog
//
MSWindowsWatchdog::MSWindowsWatchdog(bool foreground) : m_foreground(foreground) MSWindowsWatchdog::MSWindowsWatchdog(bool foreground) : m_foreground(foreground)
{ {
initSasFunc(); initSasFunc();
@ -285,28 +342,6 @@ void MSWindowsWatchdog::setProcessConfig(const std::string_view &command, bool e
} }
} }
std::string trimOutputBuffer(const CHAR *buffer)
{
// strip out windows \r chars to prevent extra lines in log file.
std::string output(buffer);
if (output.empty()) {
LOG_DEBUG1("output buffer is empty");
return output;
}
size_t pos = 0;
while ((pos = output.find("\r", pos)) != std::string::npos) {
output.replace(pos, 1, "");
}
// trip ending newline, as file writer will add it's own newline.
if (output[output.length() - 1] == '\n') {
output = output.substr(0, output.length() - 1);
}
return output;
}
void MSWindowsWatchdog::outputLoop(void *) void MSWindowsWatchdog::outputLoop(void *)
{ {
const auto kOutputBufferSize = 4096; const auto kOutputBufferSize = 4096;
@ -345,33 +380,6 @@ void MSWindowsWatchdog::outputLoop(void *)
} }
} }
HANDLE openProcessForKill(const PROCESSENTRY32 &entry)
{
// pid 0 is 'system idle process'
if (entry.th32ProcessID == 0)
return nullptr;
if (_stricmp(entry.szExeFile, "deskflow-client.exe") != 0 && //
_stricmp(entry.szExeFile, "deskflow-server.exe") != 0 && //
_stricmp(entry.szExeFile, "deskflow-core.exe") != 0) {
return nullptr;
}
HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID);
if (handle == nullptr) {
LOG((CLOG_ERR "could not open process handle for kill"));
throw XArch(new XArchEvalWindows);
}
// only shut down if not current process (daemon is now the same unified binary).
if (entry.th32ProcessID == GetCurrentProcessId()) {
CloseHandle(handle);
return nullptr;
}
return handle;
}
void MSWindowsWatchdog::shutdownExistingProcesses() void MSWindowsWatchdog::shutdownExistingProcesses()
{ {
LOG_DEBUG("shutting down any existing processes"); LOG_DEBUG("shutting down any existing processes");