Changeset 2279

Timestamp:

13/09/2008 16:11:35 (3 years ago)

Author:

chris

Message:

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.

Location:

box/trunk

Files:

• infrastructure/buildenv-testmain-template.cpp (modified) (1 diff)
• lib/common/Logging.cpp (modified) (3 diffs)
• lib/common/Logging.h (modified) (5 diffs)
• lib/server/Daemon.cpp (modified) (1 diff)

box/trunk/infrastructure/buildenv-testmain-template.cpp

@@ -258 +258 @@
                         case 't':
                         {
-                                Console::SetTag(optarg);
+                                Logging::SetProgramName(optarg);
+                                Console::SetShowTag(true);
                         }
                         break;

box/trunk/lib/common/Logging.cpp

@@ -36 +36 @@
 Log::Level  Logging::sGlobalLevel = Log::EVERYTHING;
 Logging     Logging::sGlobalLogging; //automatic initialisation
+std::string Logging::sProgramName;
 
 Logging::Logging()
@@ -207 +208 @@
 void Logging::SetProgramName(const std::string& rProgramName)
 {
+        sProgramName = rProgramName;
+
         for (std::vector<Logger*>::iterator i = sLoggers.begin();
                 i != sLoggers.end(); i++)
@@ -231 +234 @@
 std::string Console::sTag;
 
-void Console::SetTag(const std::string& rTag)
-{
-        sTag = rTag;
-        sShowTag = true;
+void Console::SetProgramName(const std::string& rProgramName)
+{
+        sTag = rProgramName;
+}
+
+void Console::SetShowTag(bool enabled)
+{
+        sShowTag = enabled;
 }
 

box/trunk/lib/common/Logging.h

@@ -144 +144 @@
 {
         private:
+        static bool sShowTag;
         static bool sShowTime;
         static bool sShowTimeMicros;
-        static bool sShowTag;
+        static bool sShowPID;
         static std::string sTag;
-        static bool sShowPID;
 
         public:
@@ -154 +154 @@
                 int line, std::string& rMessage);
         virtual const char* GetType() { return "Console"; }
-        virtual void SetProgramName(const std::string& rProgramName) { }
-
-        static void SetTag(const std::string& rTag);
+        virtual void SetProgramName(const std::string& rProgramName);
+
+        static void SetShowTag(bool enabled);
         static void SetShowTime(bool enabled);
         static void SetShowTimeMicros(bool enabled);
@@ -207 +207 @@
         static Log::Level sGlobalLevel;
         static Logging    sGlobalLogging;
+        static std::string sProgramName;
         
         public:
@@ -231 +232 @@
         }
         static void SetProgramName(const std::string& rProgramName);
+        static std::string GetProgramName() { return sProgramName; }
 
         class Guard
@@ -248 +250 @@
                 }
         };
+
+        class Tagger
+        {
+                private:
+                std::string mOldTag;
+
+                public:
+                Tagger(const std::string& rTempTag)
+                {
+                        mOldTag = Logging::GetProgramName();
+                        Logging::SetProgramName(mOldTag + " " + rTempTag);
+                }
+                ~Tagger()
+                {
+                        Logging::SetProgramName(mOldTag);
+                }
+        };
 };
 

box/trunk/lib/server/Daemon.cpp

@@ -236 +236 @@
                 case 't':
                 {
-                        Console::SetTag(optarg);
+                        Logging::SetProgramName(optarg);
+                        Console::SetShowTag(true);
                 }
                 break;