Changeset 2285

Timestamp:

14/09/2008 01:26:13 (3 years ago)

Author:

chris

Message:

Prefix event log application name with Box Backup, and remove it from
all calls to SetProgramName?, for better consistency on Unix.

Make bbstoreaccounts and bbackupctl set their program names for logging.

Don't override supplied tag with service name when BackupDaemon?
is run as a service.

Location:

box/trunk

Files:

• bin/bbackupctl/bbackupctl.cpp (modified) (1 diff)
• bin/bbackupd/BackupDaemon.cpp (modified) (2 diffs)
• bin/bbackupquery/bbackupquery.cpp (modified) (1 diff)
• bin/bbstoreaccounts/bbstoreaccounts.cpp (modified) (1 diff)
• lib/win32/emu.cpp (modified) (1 diff)

box/trunk/bin/bbackupctl/bbackupctl.cpp

@@ -63 +63 @@
         MAINHELPER_START
 
-#if defined WIN32 && ! defined NDEBUG
-        ::openlog("Box Backup (bbackupctl)", 0, 0);
-#endif
+        Logging::SetProgramName("bbackupctl");
 
         // Filename for configuration file?

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -336 +336 @@
                 {
                         mServiceName = optarg;
+                        Logging::SetProgramName(mServiceName);
                         return 0;
                 }
@@ -369 +370 @@
                 return RemoveService(mServiceName);
         }
-
-        Logging::SetProgramName("Box Backup (" + mServiceName + ")");
 
         int returnCode;

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -110 +110 @@
         bool readWrite = false;
 
-        Logging::SetProgramName("Box Backup (bbackupquery)");
+        Logging::SetProgramName("bbackupquery");
 
         #ifdef NDEBUG

box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp

@@ -460 +460 @@
         MAINHELPER_START
 
+        Logging::SetProgramName("bbstoreaccounts");
+
         // Filename for configuration file?
         std::string configFilename;

box/trunk/lib/win32/emu.cpp

@@ -1418 +1418 @@
         }
 
-        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)