Unify program name and console logging tags.

Add a new class, Logging::Tagger, which can be used to temporarily
add information to the program name, such as the client ID in bbstored.

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/common/Logging.cpp b/lib/common/Logging.cpp
index 3edb5ce6..df7c609e 100644
--- a/lib/common/Logging.cpp
+++ b/lib/common/Logging.cpp
@@ -35,6 +35,7 @@ Console*    Logging::spConsole = NULL;
 Syslog*     Logging::spSyslog  = NULL;
 Log::Level  Logging::sGlobalLevel = Log::EVERYTHING;
 Logging     Logging::sGlobalLogging; //automatic initialisation
+std::string Logging::sProgramName;
 
 Logging::Logging()
 {
@@ -206,6 +207,8 @@ void Logging::ClearContext()
 
 void Logging::SetProgramName(const std::string& rProgramName)
 {
+	sProgramName = rProgramName;
+
 	for (std::vector<Logger*>::iterator i = sLoggers.begin();
 		i != sLoggers.end(); i++)
 	{
@@ -230,10 +233,14 @@ bool Console::sShowTag = false;
 bool Console::sShowPID = false;
 std::string Console::sTag;
 
-void Console::SetTag(const std::string& rTag)
+void Console::SetProgramName(const std::string& rProgramName)
+{
+	sTag = rProgramName;
+}
+
+void Console::SetShowTag(bool enabled)
 {
-	sTag = rTag;
-	sShowTag = true;
+	sShowTag = enabled;
 }
 
 void Console::SetShowTime(bool enabled)