Fix duplicate tagging of housekeeping messages.

3 files changed, 16 insertions, 2 deletions

diff --git a/lib/backupstore/HousekeepStoreAccount.cpp b/lib/backupstore/HousekeepStoreAccount.cpp
index 311ae433..86eb1059 100644
--- a/lib/backupstore/HousekeepStoreAccount.cpp
+++ b/lib/backupstore/HousekeepStoreAccount.cpp
@@ -65,6 +65,9 @@ HousekeepStoreAccount::HousekeepStoreAccount(int AccountID,
 	  mRefCountsAdjusted(0),
 	  mCountUntilNextInterprocessMsgCheck(POLL_INTERPROCESS_MSG_CHECK_FREQUENCY)
 {
+	std::ostringstream tag;
+	tag << "hk/" << BOX_FORMAT_ACCOUNT(mAccountID);
+	mTagWithClientID.Change(tag.str());
 }
 
 // --------------------------------------------------------------------------
@@ -128,7 +131,7 @@ bool HousekeepStoreAccount::DoHousekeeping(bool KeepTryingForever)
 	std::ostringstream tag;
 	tag << "hk/" << BOX_FORMAT_ACCOUNT(mAccountID) << "/" <<
 		info->GetAccountName();
-	Logging::Tagger tagWithClientID(tag.str());
+	mTagWithClientID.Change(tag.str());
 
 	// Calculate how much should be deleted
 	mDeletionSizeTarget = info->GetBlocksUsed() - info->GetBlocksSoftLimit();
diff --git a/lib/backupstore/HousekeepStoreAccount.h b/lib/backupstore/HousekeepStoreAccount.h
index 61cff868..cfa05a2e 100644
--- a/lib/backupstore/HousekeepStoreAccount.h
+++ b/lib/backupstore/HousekeepStoreAccount.h
@@ -105,6 +105,8 @@ private:
 	
 	// Poll frequency
 	int mCountUntilNextInterprocessMsgCheck;
+
+	Logging::Tagger mTagWithClientID;
 };
 
 #endif // HOUSEKEEPSTOREACCOUNT__H
diff --git a/lib/common/Logging.h b/lib/common/Logging.h
index 574677f1..81062e38 100644
--- a/lib/common/Logging.h
+++ b/lib/common/Logging.h
@@ -346,15 +346,24 @@ class Logging
 		std::string mOldTag;
 
 		public:
+		Tagger()
+		: mOldTag(Logging::GetProgramName())
+		{
+		}
 		Tagger(const std::string& rTempTag)
+		: mOldTag(Logging::GetProgramName())
 		{
-			mOldTag = Logging::GetProgramName();
 			Logging::SetProgramName(mOldTag + " " + rTempTag);
 		}
 		~Tagger()
 		{
 			Logging::SetProgramName(mOldTag);
 		}
+
+		void Change(const std::string& newTempTag)
+		{
+			Logging::SetProgramName(mOldTag + " " + newTempTag);
+		}
 	};
 };