Changeset 2296

Timestamp:

26/09/2008 21:22:26 (3 years ago)

Author:

chris

Message:

Add file logger class.

Location:

box/trunk/lib/common

Files:

• Logging.cpp (modified) (2 diffs)
• Logging.h (modified) (3 diffs)

box/trunk/lib/common/Logging.cpp

@@ -223 +223 @@
 }
 
+Logger::Logger(Log::Level Level) 
+: mCurrentLevel(Level) 
+{
+        Logging::Add(this);
+}
+
 Logger::~Logger() 
 {
@@ -401 +407 @@
         ::openlog(mName.c_str(), LOG_PID, LOG_LOCAL6);
 }
+
+bool FileLogger::Log(Log::Level Level, const std::string& rFile, 
+        int line, std::string& rMessage)
+{
+        if (Level > GetLevel())
+        {
+                return true;
+        }
+        
+        /* avoid infinite loop if this throws an exception */
+        Logging::Remove(this);
+
+        std::ostringstream buf;
+        buf << FormatTime(GetCurrentBoxTime(), false);
+        buf << " ";
+
+        if (Level <= Log::FATAL)
+        {
+                buf << "[FATAL]   ";
+        }
+        else if (Level <= Log::ERROR)
+        {
+                buf << "[ERROR]   ";
+        }
+        else if (Level <= Log::WARNING)
+        {
+                buf << "[WARNING] ";
+        }
+        else if (Level <= Log::NOTICE)
+        {
+                buf << "[NOTICE]  ";
+        }
+        else if (Level <= Log::INFO)
+        {
+                buf << "[INFO]    ";
+        }
+        else if (Level <= Log::TRACE)
+        {
+                buf << "[TRACE]   ";
+        }
+
+        buf << rMessage << "\n";
+        std::string output = buf.str();
+
+        #ifdef WIN32
+                ConvertUtf8ToConsole(output.c_str(), output);
+        #endif
+
+        mLogFile.Write(output.c_str(), output.length());
+
+        Logging::Add(this);
+        return true;
+}

box/trunk/lib/common/Logging.h

@@ -15 +15 @@
 #include <sstream>
 #include <vector>
+
+#include "FileStream.h"
 
 /*
@@ -116 +118 @@
         public:
         Logger();
+        Logger(Log::Level level);
         virtual ~Logger();
         
@@ -269 +272 @@
 };
 
+class FileLogger : public Logger
+{
+        private:
+        FileStream mLogFile;
+        FileLogger(const FileLogger& forbidden)
+        : mLogFile("") { /* do not call */ }
+        
+        public:
+        FileLogger(const std::string& rFileName, Log::Level Level)
+        : Logger(Level),
+          mLogFile(rFileName, O_WRONLY | O_CREAT | O_APPEND)
+        { }
+        
+        virtual bool Log(Log::Level Level, const std::string& rFile, 
+                int Line, std::string& rMessage);
+        
+        virtual const char* GetType() { return "FileLogger"; }
+        virtual void SetProgramName(const std::string& rProgramName) { }
+};
+
 #endif // LOGGING__H