Changeset 1225 for box/chris/merge/lib/common/Logging.h

Timestamp:

16/12/2006 20:26:31 (5 years ago)

Author:

chris

Message:

• Rename Loggers class to Logging, which looks nicer.
• Fix type of "line" argument to loggers to int rather than std::string to match LINE
• Define necessary static objects
• Remove global condition on logging for now

(refs #3)

File:

• box/chris/merge/lib/common/Logging.h (modified) (10 diffs)

box/chris/merge/lib/common/Logging.h

@@ -14 +14 @@
 #include <vector>
 
+/*
 #define BOX_LOG(level, stuff) \
 { \
@@ -21 +22 @@
         Log::Write(level, __FILE__, __LINE__, line.str()); \
     } \
+}
+*/
+
+#define BOX_LOG(level, stuff) \
+{ \
+        std::ostringstream line; \
+        line << stuff; \
+        Logging::Log(level, __FILE__, __LINE__, line.str()); \
 }
 
@@ -42 +51 @@
 // Class
 //              Name:    Logger
-//              Purpose: Abstract class (interface) for log targets
+//              Purpose: Abstract base class for log targets
 //              Created: 2006/12/16
 //
@@ -57 +66 @@
         
         virtual bool Log(Log::Level level, const std::string& rFile, 
-                const std::string& rLine, std::string& rMessage) = 0;
+                int line, std::string& rMessage) = 0;
         
         void Filter(Log::Level level)
@@ -75 +84 @@
 //              Name:    Console
 //              Purpose: Console logging target
-//              Created: 2006/12/12
+//              Created: 2006/12/16
 //
 // --------------------------------------------------------------------------
@@ -83 +92 @@
         public:
         virtual bool Log(Log::Level level, const std::string& rFile, 
-                const std::string& rLine, std::string& rMessage);
+                int line, std::string& rMessage);
         virtual const char* GetType() { return "Console"; }
         virtual void SetProgramName(const std::string& rProgramName) { }
@@ -93 +102 @@
 //              Name:    Syslog
 //              Purpose: Syslog (or Windows Event Viewer) logging target
-//              Created: 2006/12/12
+//              Created: 2006/12/16
 //
 // --------------------------------------------------------------------------
@@ -104 +113 @@
         
         virtual bool Log(Log::Level level, const std::string& rFile, 
-                const std::string& rLine, std::string& rMessage);
+                int line, std::string& rMessage);
         virtual const char* GetType() { return "Syslog"; }
         virtual void SetProgramName(const std::string& rProgramName);
@@ -112 +121 @@
 //
 // Class
-//              Name:    Log
+//              Name:    Logging
 //              Purpose: Static logging helper, keeps track of enabled loggers
 //                       and distributes log messages to them.
-//              Created: 2006/12/12
+//              Created: 2006/12/16
 //
 // --------------------------------------------------------------------------
 
-class Loggers
+class Logging
 {
         private:
@@ -139 +148 @@
         static void Remove (Logger* pOldLogger);
         static void Log(Log::Level level, const std::string& rFile, 
-                const std::string& rLine, const std::string& rMessage);
+                int line, const std::string& rMessage);
         static void SetContext(std::string context);
         static void ClearContext();