[Box Backup-commit] COMMIT r2285 - in box/trunk: bin/bbackupctl bin/bbackupd bin/bbackupquery bin/bbstoreaccounts lib/win32

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2008-09-14 01:26:13 +0100 (Sun, 14 Sep 2008)
New Revision: 2285

Modified:
   box/trunk/bin/bbackupctl/bbackupctl.cpp
   box/trunk/bin/bbackupd/BackupDaemon.cpp
   box/trunk/bin/bbackupquery/bbackupquery.cpp
   box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp
   box/trunk/lib/win32/emu.cpp
Log:
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.


Modified: box/trunk/bin/bbackupctl/bbackupctl.cpp
===================================================================
--- box/trunk/bin/bbackupctl/bbackupctl.cpp	2008-09-13 23:43:47 UTC (rev 2284)
+++ box/trunk/bin/bbackupctl/bbackupctl.cpp	2008-09-14 00:26:13 UTC (rev 2285)
@@ -62,9 +62,7 @@
 
 	MAINHELPER_START
 
-#if defined WIN32 && ! defined NDEBUG
-	::openlog("Box Backup (bbackupctl)", 0, 0);
-#endif
+	Logging::SetProgramName("bbackupctl");
 
 	// Filename for configuration file?
 	std::string configFilename;

Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2008-09-13 23:43:47 UTC (rev 2284)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2008-09-14 00:26:13 UTC (rev 2285)
@@ -335,6 +335,7 @@
 		case 'S':
 		{
 			mServiceName = optarg;
+			Logging::SetProgramName(mServiceName);
 			return 0;
 		}
 
@@ -369,8 +370,6 @@
 		return RemoveService(mServiceName);
 	}
 
-	Logging::SetProgramName("Box Backup (" + mServiceName + ")");
-
 	int returnCode;
 
 	if (mRunAsService)

Modified: box/trunk/bin/bbackupquery/bbackupquery.cpp
===================================================================
--- box/trunk/bin/bbackupquery/bbackupquery.cpp	2008-09-13 23:43:47 UTC (rev 2284)
+++ box/trunk/bin/bbackupquery/bbackupquery.cpp	2008-09-14 00:26:13 UTC (rev 2285)
@@ -109,7 +109,7 @@
 	// 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

Modified: box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp
===================================================================
--- box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp	2008-09-13 23:43:47 UTC (rev 2284)
+++ box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp	2008-09-14 00:26:13 UTC (rev 2285)
@@ -459,6 +459,8 @@
 
 	MAINHELPER_START
 
+	Logging::SetProgramName("bbstoreaccounts");
+
 	// Filename for configuration file?
 	std::string configFilename;
 

Modified: box/trunk/lib/win32/emu.cpp
===================================================================
--- box/trunk/lib/win32/emu.cpp	2008-09-13 23:43:47 UTC (rev 2284)
+++ box/trunk/lib/win32/emu.cpp	2008-09-14 00:26:13 UTC (rev 2285)
@@ -1417,9 +1417,8 @@
 	{
 	}
 
-	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)
 	{