mylog

YAServer.vcxproj

@@ -190,12 +190,12 @@ xcopy "$(SolutionDir)..\config.ini" "D:\0a-share\$(Configuration)\" /Y /C /D /S<
     <ClInclude Include="KNN\KNN.h" />
     <ClInclude Include="LocateRecord.h" />
     <ClInclude Include="LogSetting.h" />
-    <ClInclude Include="log\ExRollingFileAppender.h" />
-    <ClInclude Include="log\log_module.h" />
-    <ClInclude Include="log\MyLog.h" />
     <ClInclude Include="log_def.h" />
     <ClInclude Include="log_process_module.h" />
     <ClInclude Include="minidupm.h" />
+    <ClInclude Include="mylog\ExRollingFileAppender.h" />
+    <ClInclude Include="mylog\log_module.h" />
+    <ClInclude Include="mylog\MyLog.h" />
     <ClInclude Include="MysqlConnPool.h" />
     <ClInclude Include="ProcessRemodule.h" />
     <ClInclude Include="QueueStrManager.h" />
@@ -285,13 +285,13 @@ xcopy "$(SolutionDir)..\config.ini" "D:\0a-share\$(Configuration)\" /Y /C /D /S<
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="LogSetting.cpp" />
-    <ClCompile Include="log\log_module.cpp" />
-    <ClCompile Include="log\MyLog.cpp" />
     <ClCompile Include="log_process_module.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="minidump.cpp" />
+    <ClCompile Include="mylog\log_module.cpp" />
+    <ClCompile Include="mylog\MyLog.cpp" />
     <ClCompile Include="MysqlConnPool.cpp" />
     <ClCompile Include="ProcessRemodule.cpp" />
     <ClCompile Include="QueueStrManager.cpp" />

YAServer.vcxproj.filters

@@ -118,10 +118,10 @@
     <ClCompile Include="algorithm\FittingPosition.cpp">
       <Filter>algorithm</Filter>
     </ClCompile>
-    <ClCompile Include="log\MyLog.cpp">
+    <ClCompile Include="mylog\log_module.cpp">
       <Filter>mylog</Filter>
     </ClCompile>
-    <ClCompile Include="log\log_module.cpp">
+    <ClCompile Include="mylog\MyLog.cpp">
       <Filter>mylog</Filter>
     </ClCompile>
   </ItemGroup>
@@ -316,16 +316,16 @@
     <ClInclude Include="algorithm\Fit.h">
       <Filter>algorithm</Filter>
     </ClInclude>
-    <ClInclude Include="log\MyLog.h">
+    <ClInclude Include="LocateRecord.h" />
+    <ClInclude Include="mylog\ExRollingFileAppender.h">
       <Filter>mylog</Filter>
     </ClInclude>
-    <ClInclude Include="log\log_module.h">
+    <ClInclude Include="mylog\log_module.h">
       <Filter>mylog</Filter>
     </ClInclude>
-    <ClInclude Include="log\ExRollingFileAppender.h">
+    <ClInclude Include="mylog\MyLog.h">
       <Filter>mylog</Filter>
     </ClInclude>
-    <ClInclude Include="LocateRecord.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\config.ini" />

YAServerDlg.cpp

@@ -38,7 +38,7 @@
 #include "./CSVparser/CSVparser.h"
 #include "./KNN/KNN.h"
 #include "algorithm/Fit.h"
-#include "log/log_module.h"
+#include "mylog/log_module.h"
 
 // ÓÃÀ´¸ú×ÙÄÚ´æʹÓÃÇé¿ö
 #define TRACE_MEMORY_WRITELOG
@@ -12569,7 +12569,7 @@ void CYAServerDlg::AnalysisAlgoFailedData(int interval  /*=60000*//*std::shared_
 		if (m_log_locate_data)
 		{
 			std::string strLog = chLog;
-			Log::write_log(FILE_TYPE::ALGO_F,strLog,true);
+			Log::write_log(FILE_TYPE::ALGO_S,strLog,true);
 		}
 	}
 }
@@ -13094,7 +13094,7 @@ void CYAServerDlg::deal_card_msg( std::shared_ptr<Card> card/*Card* card*/, bool
 						card->card_id.c_str()
 						);
 					strlog = chlog;
-					Log::write_log(FILE_TYPE::DIST_EX_S, strlog, true);
+					Log::write_log(FILE_TYPE::DISTEX_S, strlog, true);
 
 					memset(chlog, 0, MAX_LOG_LENGTH);
 					sprintf_s(chlog, "cardid: %s, sync_num: %d, ox: %f, oy: %f, x: %f,y: %f,ct: %d, ov: %f,cv: %f", 

classdef.cpp

@@ -8,7 +8,7 @@
 #include "log_process_module.h"
 #include "Functions/Functions.h"
 #include "algorithm/Fit.h"
-#include "./log/log_module.h"
+#include "./mylog/log_module.h"
 
 #include <math.h>
 

mylog/MyLog.cpp

@@ -240,13 +240,11 @@ std::string MyLog::GetFileName()
 
 	strftime(chDate, 255, "%Y%m%d", t);
 	stringDate = chDate;
-
-	//curFileName = my_log_file_name[fileType] + "_" + stringDate + "_" + int2string(curFileCount) + ".log";
+	//curFileName = my_log_file_name[fileType] + "_" + curDate + "_" + int2string(curFileCount) + ".log";
 	curFileName = my_log_file_name[fileType] + "_" + stringDate + ".log";
-
+	
 	if (t) {
 		delete t;
 	}
-
 	return curFileName;
 }

mylog/MyLog.h

@@ -25,23 +25,31 @@
 
 enum FILE_TYPE {
 	RAW_S = 0,
+	SYNC_S,
 	DIST_S,
+	DISTEX_S,
+	DISTXX_S,
 	JSON_S,
+	JSON_R,
 	SQL_S,
 	SYS_S,
 	KALMAN_S,
-	ALGO_F,
+	ALGO_S,
 	FILE_TYPE_TOTLA
 };
 
 const std::string my_log_file_name[] = {
-	"Raw_s",
-	"Dist_s",
-	"Json_s",
-	"Sql_s",
-	"Sys_s",
-	"Kalman_s",
-	"Algo_s"
+	"raw_s",
+	"sync_s"
+	"dist_s",
+	"distex_s",
+	"distxx_s",
+	"json_s",
+	"json_r",
+	"sql_s",
+	"sys_s",
+	"kalman_s",
+	"algo_s"
 };
 
 const std::string log_file_pattern[] = {

mylog/log_module.cpp

@@ -11,34 +11,7 @@ int Log::init_log_module()
 
 	for (int i = 0; i < FILE_TYPE_TOTLA; i++)
 	{
-		FILE_TYPE type;
-		switch (i)
-		{
-		case 0:
-			type = FILE_TYPE::RAW_S;
-			break;
-		case 1:
-			type = FILE_TYPE::DIST_S;
-			break;
-		case 2:
-			type = FILE_TYPE::JSON_S;
-			break;
-		case 3:
-			type = FILE_TYPE::SQL_S;
-			break;
-		case 4:
-			type = FILE_TYPE::SYS_S;
-			break;
-		case 5:
-			type = FILE_TYPE::KALMAN_S;
-			break;
-		case 6:
-			type = FILE_TYPE::ALGO_F;
-			break;
-		default:
-			break;
-		}
-		std::shared_ptr<MyLog> log = std::make_shared<MyLog>(type);
+		std::shared_ptr<MyLog> log = std::make_shared<MyLog>((FILE_TYPE)i);
 		vtLog.push_back(log);
 
 		//mpLog.insert(std::make_pair(my_log_file_name[i],log));