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

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.cpp (modified) (11 diffs)

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

@@ -16 +16 @@
 #include "Logging.h"
 
-bool Loggers::sLogToSyslog  = false;
-bool Loggers::sLogToConsole = false;
-bool Loggers::sContextSet   = false;
+bool Logging::sLogToSyslog  = false;
+bool Logging::sLogToConsole = false;
+bool Logging::sContextSet   = false;
 
-void Loggers::ToSyslog(bool enabled)
+std::vector<Logger*> Logging::sLoggers;
+std::string Logging::sContext;
+Console    Logging::sConsole;
+Syslog     Logging::sSyslog;
+Log::Level  Logging::sGlobalLevel;
+
+void Logging::ToSyslog(bool enabled)
 {
         if (!sLogToSyslog && enabled)
@@ -35 +41 @@
 }
 
-void Loggers::ToConsole(bool enabled)
+void Logging::ToConsole(bool enabled)
 {
         if (!sLogToConsole && enabled)
@@ -50 +56 @@
 }
 
-void Loggers::FilterConsole(Log::Level level)
+void Logging::FilterConsole(Log::Level level)
 {
         sConsole.Filter(level);
 }
 
-void Loggers::FilterSyslog(Log::Level level)
+void Logging::FilterSyslog(Log::Level level)
 {
         sSyslog.Filter(level);
 }
 
-void Loggers::Add(Logger* pNewLogger)
+void Logging::Add(Logger* pNewLogger)
 {
         for (std::vector<Logger*>::iterator i = sLoggers.begin();
@@ -74 +80 @@
 }
 
-void Loggers::Remove(Logger* pOldLogger)
+void Logging::Remove(Logger* pOldLogger)
 {
         for (std::vector<Logger*>::iterator i = sLoggers.begin();
@@ -87 +93 @@
 }
 
-void Loggers::Log(Log::Level level, const std::string& rFile, 
-        const std::string& rLine, const std::string& rMessage)
+void Logging::Log(Log::Level level, const std::string& rFile, 
+        int line, const std::string& rMessage)
 {
         std::string newMessage;
@@ -102 +108 @@
                 i != sLoggers.end(); i++)
         {
-                bool result = (*i)->Log(level, rFile, rLine, newMessage);
+                bool result = (*i)->Log(level, rFile, line, newMessage);
                 if (!result)
                 {
@@ -110 +116 @@
 }
 
-void Loggers::SetContext(std::string context)
+void Logging::SetContext(std::string context)
 {
         sContext = context;
@@ -116 +122 @@
 }
 
-void Loggers::ClearContext()
+void Logging::ClearContext()
 {
         sContextSet = false;
 }
 
-void Loggers::SetProgramName(const std::string& rProgramName)
+void Logging::SetProgramName(const std::string& rProgramName)
 {
         for (std::vector<Logger*>::iterator i = sLoggers.begin();
@@ -131 +137 @@
 
 bool Console::Log(Log::Level level, const std::string& rFile, 
-        const std::string& rLine, std::string& rMessage)
+        int line, std::string& rMessage)
 {
         if (level > GetLevel())
@@ -145 +151 @@
         }
         
-        fprintf(target, "%s", rMessage.c_str());
+        fprintf(target, "%s\n", rMessage.c_str());
         
         return true;
@@ -151 +157 @@
 
 bool Syslog::Log(Log::Level level, const std::string& rFile, 
-        const std::string& rLine, std::string& rMessage)
+        int line, std::string& rMessage)
 {
         if (level > GetLevel())