diff options
| -rw-r--r-- | bin/bbackupctl/bbackupctl.cpp | 4 | ||||
| -rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 3 | ||||
| -rw-r--r-- | bin/bbackupquery/bbackupquery.cpp | 2 | ||||
| -rw-r--r-- | bin/bbstoreaccounts/bbstoreaccounts.cpp | 2 | ||||
| -rw-r--r-- | lib/win32/emu.cpp | 5 |
5 files changed, 7 insertions, 9 deletions
diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp index 52f7c2ed..27c79926 100644 --- a/bin/bbackupctl/bbackupctl.cpp +++ b/bin/bbackupctl/bbackupctl.cpp @@ -62,9 +62,7 @@ int main(int argc, const char *argv[]) MAINHELPER_START -#if defined WIN32 && ! defined NDEBUG - ::openlog("Box Backup (bbackupctl)", 0, 0); -#endif + Logging::SetProgramName("bbackupctl"); // Filename for configuration file? std::string configFilename; diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index a17870ed..12e5fcd2 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -335,6 +335,7 @@ int BackupDaemon::ProcessOption(signed int option) case 'S': { mServiceName = optarg; + Logging::SetProgramName(mServiceName); return 0; } @@ -369,8 +370,6 @@ int BackupDaemon::Main(const std::string &rConfigFileName) return RemoveService(mServiceName); } - Logging::SetProgramName("Box Backup (" + mServiceName + ")"); - int returnCode; if (mRunAsService) diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp index bba3f89f..26d4ae50 100644 --- a/bin/bbackupquery/bbackupquery.cpp +++ b/bin/bbackupquery/bbackupquery.cpp @@ -109,7 +109,7 @@ int main(int argc, const char *argv[]) // Flags bool readWrite = false; - Logging::SetProgramName("Box Backup (bbackupquery)"); + Logging::SetProgramName("bbackupquery"); #ifdef NDEBUG int masterLevel = Log::NOTICE; // need an int to do math with diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp index 2546026f..e1700278 100644 --- a/bin/bbstoreaccounts/bbstoreaccounts.cpp +++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp @@ -459,6 +459,8 @@ int main(int argc, const char *argv[]) MAINHELPER_START + Logging::SetProgramName("bbstoreaccounts"); + // Filename for configuration file? std::string configFilename; diff --git a/lib/win32/emu.cpp b/lib/win32/emu.cpp index 5a61fc3f..aeacf344 100644 --- a/lib/win32/emu.cpp +++ b/lib/win32/emu.cpp @@ -1417,9 +1417,8 @@ void openlog(const char * daemonName, int, int) { } - char* name = strdup(daemonName); - BOOL success = AddEventSource(name, 0); - free(name); + std::string name = "Box Backup (" + daemonName + ")"; + BOOL success = AddEventSource(name.c_str(), 0); if (!success) { |