[Box Backup-commit] COMMIT r3159 - box/trunk/lib/backupstore

subversion at boxbackup.org subversion at boxbackup.org
Sun Nov 18 16:31:24 GMT 2012


Author: chris
Date: 2012-11-18 16:31:24 +0000 (Sun, 18 Nov 2012)
New Revision: 3159

Modified:
   box/trunk/lib/backupstore/HousekeepStoreAccount.cpp
Log:
Cosmetic improvements to bbstored log message tagging.


Modified: box/trunk/lib/backupstore/HousekeepStoreAccount.cpp
===================================================================
--- box/trunk/lib/backupstore/HousekeepStoreAccount.cpp	2012-11-18 16:30:52 UTC (rev 3158)
+++ box/trunk/lib/backupstore/HousekeepStoreAccount.cpp	2012-11-18 16:31:24 UTC (rev 3159)
@@ -66,7 +66,7 @@
 	  mCountUntilNextInterprocessMsgCheck(POLL_INTERPROCESS_MSG_CHECK_FREQUENCY)
 {
 	std::ostringstream tag;
-	tag << "hk/" << BOX_FORMAT_ACCOUNT(mAccountID);
+	tag << "hk=" << BOX_FORMAT_ACCOUNT(mAccountID);
 	mTagWithClientID.Change(tag.str());
 }
 
@@ -127,11 +127,14 @@
 		BackupStoreInfo::Load(mAccountID, mStoreRoot, mStoreDiscSet,
 			true /* Read Only */));
 
-	// Tag log output to identify account
-	std::ostringstream tag;
-	tag << "hk/" << BOX_FORMAT_ACCOUNT(mAccountID) << "/" <<
-		info->GetAccountName();
-	mTagWithClientID.Change(tag.str());
+	// If the account has a name, change the logging tag to include it
+	if(!(info->GetAccountName().empty()))
+	{
+		std::ostringstream tag;
+		tag << "hk=" << BOX_FORMAT_ACCOUNT(mAccountID) << "/" <<
+			info->GetAccountName();
+		mTagWithClientID.Change(tag.str());
+	}
 
 	// Calculate how much should be deleted
 	mDeletionSizeTarget = info->GetBlocksUsed() - info->GetBlocksSoftLimit();




More information about the Boxbackup-commit mailing list