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

refactor(daemon): Move file log init code to init functions

Browse source
This commit is contained in:
Nick Bolton 2025-03-04 13:32:07 +00:00
parent c583252b03
commit cd0aa6496a
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/apps/deskflow-daemon/deskflow-daemon.cpp
View file

@ -62,6 +62,12 @@ int main(int argc, char **argv)
// was uninstalled, since sometimes Windows services can get stuck and fail to be removed. // was uninstalled, since sometimes Windows services can get stuck and fail to be removed.
LOG_PRINT("%s Daemon v%s", kAppName, kDisplayVersion); LOG_PRINT("%s Daemon v%s", kAppName, kDisplayVersion);
// Default log level to system setting (found in Registry).
if (std::string logLevel = ARCH->setting("LogLevel"); logLevel != "") {
CLOG->setFilter(logLevel.c_str());
LOG_DEBUG("log level: %s", logLevel.c_str());
}
switch (initResult) { switch (initResult) {
using enum DaemonApp::InitResult; using enum DaemonApp::InitResult;

14
src/lib/deskflow/DaemonApp.cpp
View file

@ -39,7 +39,12 @@ void showHelp(int argc, char **argv) // NOSONAR - CLI args
std::cout << "Usage: " << binName << " [-f|--foreground] [--install] [--uninstall]" << std::endl; std::cout << "Usage: " << binName << " [-f|--foreground] [--install] [--uninstall]" << std::endl;
} }
DaemonApp::DaemonApp() = default; DaemonApp::DaemonApp()
{
m_fileLogOutputter = new FileLogOutputter(logFilename().c_str()); // NOSONAR - Adopted by `Log`
CLOG->insert(m_fileLogOutputter);
}
DaemonApp::~DaemonApp() = default; DaemonApp::~DaemonApp() = default;
int daemonLoop() int daemonLoop()
@ -151,13 +156,6 @@ DaemonApp::InitResult DaemonApp::init(IEventQueue *events, int argc, char **argv
m_events = events; m_events = events;
m_fileLogOutputter = new FileLogOutputter(logFilename().c_str()); // NOSONAR - Adopted by `Log`
CLOG->insert(m_fileLogOutputter);
// default log level to system setting.
if (string logLevel = ARCH->setting("LogLevel"); logLevel != "")
CLOG->setFilter(logLevel.c_str());
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
string arg(argv[i]); string arg(argv[i]);