From 13ed447a930bf90d1506bc0732e6babbc20be674 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Tue, 25 Feb 2025 11:37:15 +0000 Subject: [PATCH] chore: Move daemon constants to constants file --- src/lib/common/constants.h.in | 2 ++ src/lib/deskflow/DaemonApp.cpp | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/common/constants.h.in b/src/lib/common/constants.h.in index 743ef789d..90693aacc 100644 --- a/src/lib/common/constants.h.in +++ b/src/lib/common/constants.h.in @@ -12,7 +12,9 @@ const auto kAppId = "@CMAKE_PROJECT_NAME@"; const auto kAppDescription = "@CMAKE_PROJECT_DESCRIPTION@"; const auto kVersion = "@CMAKE_PROJECT_VERSION@"; const auto kVersionGitSha = "@GIT_SHA_SHORT@"; +const auto kDaemonBinName = "@CMAKE_PROJECT_NAME@-daemon"; const auto kDaemonIpcName = "@CMAKE_PROJECT_NAME@-daemon"; +const auto kDaemonLogFilename = "@CMAKE_PROJECT_NAME@-daemon.log"; const auto kCopyright = // "Copyright @CMAKE_PROJECT_COPYRIGHT@\n" diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp index 6cc4ca717..a14635581 100644 --- a/src/lib/deskflow/DaemonApp.cpp +++ b/src/lib/deskflow/DaemonApp.cpp @@ -33,12 +33,10 @@ using namespace std; using namespace deskflow::core; -const char *const kLogFilename = "deskflow-daemon.log"; - void showHelp(int argc, char **argv) // NOSONAR - CLI args { - const auto binName = argc > 0 ? std::filesystem::path(argv[0]).filename().string() : "deskflow-core"; - std::cout << "Usage: " << binName << " daemon [-f|--foreground] [--install] [--uninstall]" << std::endl; + const auto binName = argc > 0 ? std::filesystem::path(argv[0]).filename().string() : kDaemonBinName; + std::cout << "Usage: " << binName << " [-f|--foreground] [--install] [--uninstall]" << std::endl; } DaemonApp::DaemonApp() = default; @@ -254,7 +252,7 @@ std::string DaemonApp::logFilename() if (logFilename.empty()) { logFilename = ARCH->getLogDirectory(); logFilename.append("/"); - logFilename.append(kLogFilename); + logFilename.append(kDaemonLogFilename); } return logFilename;