If the log file was locked, a crash dump was created.

bholliger · Apr 18, 2015 · a0ea95f · a0ea95f
1 parent f1c2d17
commit a0ea95f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/hmailserver/source/Server/Common/Application/Logger.cpp b/hmailserver/source/Server/Common/Application/Logger.cpp
@@ -342,7 +342,18 @@ namespace HM
          break;
       }
 
-      bool fileExists = FileUtilities::Exists(fileName);
+      bool fileExists = false;
+
+      try
+      {
+         bool fileExists = FileUtilities::Exists(fileName);
+      }
+      catch (boost::system::system_error&)
+      {
+         // If the log is not accessible for some reason, such as error code 5 - access is denied, 
+         // then we can't open the log file. This will result in nothing being logged.
+         return nullptr;
+      }
 
       if (file->IsOpen())
       {
@@ -354,7 +365,8 @@ namespace HM
 
       if (!file->IsOpen())
       {
-         file->Open(fileName, File::OTAppend);
+         if (!file->Open(fileName, File::OTAppend))
+            return nullptr;
 
          if (!fileExists && writeUnicode)
          {
@@ -365,12 +377,14 @@ namespace HM
       return file;
    }
 
-   bool
+   void
    Logger::WriteData_(const String &sData, LogType lt)
    {
       boost::lock_guard<boost::recursive_mutex> guard(mtx_);
 
       File *file = GetCurrentLogFile_(lt);
+      if (file == nullptr)
+         return;
 
       bool writeUnicode = false;
       bool keepFileOpen = (log_mask_ & LSKeepFilesOpen) && (lt == Normal || lt == SMTP || lt == POP3 || lt == IMAP);
@@ -417,8 +431,6 @@ namespace HM
 
       if (!keepFileOpen)
          file->Close();
-
-      return true;
    }
 
 

diff --git a/hmailserver/source/Server/Common/Application/Logger.h b/hmailserver/source/Server/Common/Application/Logger.h
@@ -122,7 +122,7 @@ namespace HM
       File* GetCurrentLogFile_(LogType lt);
 
       void LogLive_(String &sMessage);
-      bool WriteData_(const String &sData, LogType = Normal);
+      void WriteData_(const String &sData, LogType = Normal);
 
       static Logger *pInstanceApp;