Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/SGMeasurement/Logger.cpp

@@ -1,4 +1,4 @@
#include "pch.h"
#include "pch.h"
#include "Logger.h"

CLogger& CLogger::Instance()
@@ -21,8 +21,17 @@
{
   CSingleLock lock(&m_csLogLock, TRUE);

   TCHAR szPath[MAX_PATH] = { 0 };
   GetModuleFileName(NULL, szPath, MAX_PATH);

   CString strPath = szPath;
   int pos = strPath.ReverseFind('\\');
   if (pos != -1) {
      strPath = strPath.Left(pos + 1);
   }

   CTime now = CTime::GetCurrentTime();
   CString strLogDir = _T("Log");
   CString strLogDir = strPath + _T("Log");

   if (!PathFileExists(strLogDir)) {
      CreateDirectory(strLogDir, NULL);
@@ -37,8 +46,7 @@
         m_logFile.Close();
      }

      if (m_logFile.Open(strNewPath,
         CFile::modeCreate | CFile::modeNoTruncate | CFile::modeWrite | CFile::typeBinary)) {
      if (m_logFile.Open(strNewPath, CFile::modeCreate | CFile::modeNoTruncate | CFile::modeWrite | CFile::typeBinary | CFile::shareDenyWrite)) {

         if (m_logFile.GetLength() == 0) {
            WCHAR bom = 0xFEFF;