Z991239-5349 #comment fea: relate CmptId and CmptName to websocket's logs

Framework/Common/SpBase.h

@@ -1616,8 +1616,8 @@ private:
 	static int m_saveFile;
 };
 
-//创建日志存储模块，通常由sphost自动创建，不需要实体创建
-SPBASE_API void* create_log_producer_storage(CSimpleStringA entityName, CSimpleStringA item, CSimpleStringA filePath);
+//创建日志存储模块，通常由sphost自动创建，不需要实体创建, CmptId, CmptName一般使用默认值
+SPBASE_API void* create_log_producer_storage(CSimpleStringA entityName, CSimpleStringA item, CSimpleStringA filePath, CSimpleStringA CmptId, CSimpleString CmptName);
 SPBASE_API void destroy_log_producer_storage(void* obj);
 //创建日志上传模块，通常由spshell自动创建，然后上传
 SPBASE_API void* create_log_producer_send(CSimpleStringA endpoint, CSimpleStringA topicSys, CSimpleStringA topicUser, CSimpleStringA topicBeidou, CSimpleStringA bussinessSys, CSimpleStringA bussinessUser,

Framework/spbase/SpSecureClient.cpp

@@ -113,7 +113,7 @@ SpSecureClient::SpSecureClient(CEntityBase *pEntityBase)
 {
 	m_pEntity = pEntityBase;
 	if(logProducer == NULL) {
-		logProducer = create_log_producer_storage("DualActive", "0", "");
+		logProducer = create_log_producer_storage("DualActive", "0", "", "", "");
 	}
 }
 

Framework/spbase/sp_logwithlink.cpp

@@ -568,7 +568,7 @@ std::string toLowerCase(std::string str) {
     return str;
 }
 
-SPBASE_API void* create_log_producer_storage(CSimpleStringA entityName, CSimpleStringA item, CSimpleStringA filePath)
+SPBASE_API void* create_log_producer_storage(CSimpleStringA entityName, CSimpleStringA item, CSimpleStringA filePath, CSimpleStringA CmptId, CSimpleString CmptName)
 {
     WLog_DBG(TAG, "create log producer storage for %s, %s, %s", entityName.GetData(), item.GetData(), filePath.GetData());
     log_producer_config* config = create_log_producer_config();
@@ -590,8 +590,14 @@ SPBASE_API void* create_log_producer_storage(CSimpleStringA entityName, CSimpleS
     log_producer_config_set_send_thread_count(config, 1);
     log_producer_config_set_persistent_max_log_count(config, 50 * 1000);
     log_producer_config_set_skyeye_servname(config, (char*)"Terminal");
-    log_producer_config_set_skyeye_cmptId(config, (char*)"LR04");
-    log_producer_config_set_skyeye_cmptname(config, (char*)"FrameworkLib");
+    if(CmptId.GetLength() > 0)
+        log_producer_config_set_skyeye_cmptId(config, (char*)CmptId.GetData());
+    else
+        log_producer_config_set_skyeye_cmptId(config, (char*)"LR04");
+    if(CmptName.GetLength() > 0)
+        log_producer_config_set_skyeye_cmptname(config, (char*)CmptName.GetData());
+    else
+        log_producer_config_set_skyeye_cmptname(config, (char*)"FrameworkLib");
     log_producer_config_set_skyeye_version(config, (char*)"1.0");
     log_producer_config_set_persistent(config, 1);
 
@@ -783,12 +789,12 @@ SPBASE_API bool create_log_producer_default(CSimpleStringA entityName, int idx)
 #ifndef _WIN32
     
     WLog_DBG(TAG, "create defaut log_producer(create log producer storage) for %s %d", entityName.GetData(), idxStr.GetData());
-    g_logProducer = create_log_producer_storage(entityName, idxStr, "");
+    g_logProducer = create_log_producer_storage(entityName, idxStr, "", "", "");
     if (g_logProducer == NULL)
         WLog_ERR(TAG, "create log producer storage return null!");
     return (NULL != g_logProducer);
 #else
-	return NULL != (g_logProducer = create_log_producer_storage(entityName, idxStr, ""));
+	return NULL != (g_logProducer = create_log_producer_storage(entityName, idxStr, "", "", ""));
 #endif
 }
 

Framework/sphost/SpHostLog.cpp

@@ -490,7 +490,7 @@ void DbgWithLink_sphost(const char* formatStr, ...) {
 
 int createLogProducer(const char* entityName, const char *id)
 {
-	g_logProducer = create_log_producer_storage("sphost", id, "");
+	g_logProducer = create_log_producer_storage("sphost", id, "", "", "");
 	if (g_logProducer == NULL)
 		return -1;
 	return 0;

Module/mod_chromium/CWebsocketServer.cpp

@@ -243,6 +243,9 @@ namespace Chromium {
 			const char* msg_TipMsg = "TipMsg";
 			const char* msg_BeginTime = "BeginTime";
 			const char* msg_EndTime = "EndTime";
+			const char* msg_CmptId = "CmptId";
+			const char* msg_CmptName = "CmptName";
+
 
 
 			auto msg = json_deal::getStringFromCjsonObj(pJson.get(), msg_nodeName);
@@ -261,12 +264,19 @@ namespace Chromium {
 			//create the logProduer if not exist
 			if (g_logProducerArr.find(t_entityName.second.GetData()) == g_logProducerArr.end())//can not find the logProducer
 			{
-				void *t_producer = create_log_producer_storage(t_entityName.second.GetData(), "0", "");
+				auto t_CmptId = json_deal::getStringFromCjsonObj(pJson.get(), msg_CmptId);
+				auto t_CmptName = json_deal::getStringFromCjsonObj(pJson.get(), msg_CmptName);
+
+
+				void *t_producer = create_log_producer_storage(t_entityName.second.GetData(), "0", "", t_CmptId.second.GetData(), t_CmptName.second.GetData());
 				if (!t_producer)
 				{
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("create producer failed, %s", t_entityName.second.GetData());
 					break;
 				}
+				else
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("create producer sueccess, entityName:%s, CmptId:%s, t_CmptName:%s"
+						, t_entityName.second.GetData(), t_CmptId.second.GetData(), t_CmptName.second.GetData());
 				g_logProducerArr.insert(std::make_pair(t_entityName.second.GetData(), t_producer));
 			}
 			auto t_logProducer = g_logProducerArr[t_entityName.second.GetData()];

Module/mod_chromium/mod_chromium.cpp

@@ -526,7 +526,7 @@ namespace Chromium {
 		// init cef logger first
 #if (defined _WIN32 || defined _WIN64)
 		if (!logProducer)
-			logProducer = create_log_producer_storage("cefclient_logger", "0", "");
+			logProducer = create_log_producer_storage("cefclient_logger", "0", "", "", "");
 #else
 		CSimpleString dbgPath;
 		GetFunction()->GetPath("Dbg", dbgPath);