Tag housekeeping logging with the account number and name.

2 files changed, 20 insertions, 12 deletions

diff --git a/bin/bbstored/BBStoreDHousekeeping.cpp b/bin/bbstored/BBStoreDHousekeeping.cpp
index 7f799008..d0f83aed 100644
--- a/bin/bbstored/BBStoreDHousekeeping.cpp
+++ b/bin/bbstored/BBStoreDHousekeeping.cpp
@@ -100,18 +100,20 @@ void BackupStoreDaemon::RunHousekeepingIfNeeded()
 	{
 		try
 		{
-			if(mpAccounts)
-			{
-				// Get the account root
-				std::string rootDir;
-				int discSet = 0;
-				mpAccounts->GetAccountRoot(*i, rootDir, discSet);
-				
-				// Do housekeeping on this account
-				HousekeepStoreAccount housekeeping(*i, rootDir,
-					discSet, this);
-				housekeeping.DoHousekeeping();
-			}
+			// Tag log output to identify account
+			std::ostringstream tag;
+			tag << "hk/" << BOX_FORMAT_ACCOUNT(*i);
+			Logging::Tagger tagWithClientID(tag.str());
+
+			// Get the account root
+			std::string rootDir;
+			int discSet = 0;
+			mpAccounts->GetAccountRoot(*i, rootDir, discSet);
+			
+			// Do housekeeping on this account
+			HousekeepStoreAccount housekeeping(*i, rootDir,
+				discSet, this);
+			housekeeping.DoHousekeeping();
 		}
 		catch(BoxException &e)
 		{
diff --git a/bin/bbstored/HousekeepStoreAccount.cpp b/bin/bbstored/HousekeepStoreAccount.cpp
index 166a58e6..dde813f9 100644
--- a/bin/bbstored/HousekeepStoreAccount.cpp
+++ b/bin/bbstored/HousekeepStoreAccount.cpp
@@ -122,6 +122,12 @@ void HousekeepStoreAccount::DoHousekeeping(bool KeepTryingForever)
 		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();
+	Logging::Tagger tagWithClientID(tag.str());
+
 	// Calculate how much should be deleted
 	mDeletionSizeTarget = info->GetBlocksUsed() - info->GetBlocksSoftLimit();
 	if(mDeletionSizeTarget < 0)