!2 remove loki logs

Framework/RvcLogSdk/baseFun.cpp

@@ -50,10 +50,10 @@ int RvcLogSdkManager::LOG_OS_TestLogPost(const char* url, const char* body)
     return 0;
 }
 int RvcLogSdkManager::SendTestLog(const char* body)
-{
+{//http://99.12.43.134:9000/upload_msg
     if (m_testLogMode == false)
         return -1;
-    HttpClientRequestConfig sendErr(HttpRequestMethod::POST, "http://99.12.43.134:9000/upload_msg");
+    HttpClientRequestConfig sendErr(HttpRequestMethod::POST, "");
     HttpClientResponseResult curResult;
     Json::Value rootReq;
     Json::FastWriter writer;
@@ -68,7 +68,9 @@ int RvcLogSdkManager::SendTestLog(const char* body)
 }
 
 int RvcLogSdkManager::SendTestLog_loki(const char* app, const char* env, const char* body)
-{
+{//http://99.12.23.49:3100/loki/api/v1/push
+    if (m_testLogMode == false)
+        return -1;
     // 1. ¹¹ÔìLoki¼æÈݵÄJSONÇëÇóÌå
     Json::Value root;
     Json::Value stream;
@@ -98,7 +100,7 @@ int RvcLogSdkManager::SendTestLog_loki(const char* app, const char* env, const c
 
     auto send_loki = [](std::string jsonReq)
     {
-        HttpClientRequestConfig sendErr(HttpRequestMethod::POST, "http://99.12.23.49:3100/loki/api/v1/push");
+        HttpClientRequestConfig sendErr(HttpRequestMethod::POST, "");
         sendErr.setWithToken(false);
         HttpClientResponseResult curResult;
 

Framework/RvcLogSdk/log_api.cpp

@@ -442,11 +442,24 @@ post_log_result* post_logs(const char* endpoint, const char* accesskeyId, const
         if(buffer->data != NULL && buffer->length != 0)
 			res = LOG_OS_HttpPost(url, header_array, header_count, (const void *) buffer->data, buffer->length, channelId, token, terminalno, reserve1);
 
-		for (auto i = 0; i < buffer->n_logs; i++)
+		/*
+		if (buffer->type == LOG_TYPE_BEIDOU)
 		{
-			std::string dstLog = std::string(buffer->uuid[i]) + " post_logs";
-			log_producer_sendTestLog_loki("RVCLogSDK", buffer->uuid[i], dstLog.c_str());
+			for (auto i = 0; i < buffer->n_logs; i++)
+			{
+				std::string dstLog = std::string(buffer->uuid[i]) + " post_logs_beidou";
+				log_producer_sendTestLog_loki("RVCLogSDK", buffer->uuid[i], dstLog.c_str());
+			}
+		}
+		else
+		{
+			for (auto i = 0; i < buffer->n_logs; i++)
+			{
+				std::string dstLog = std::string(buffer->uuid[i]) + " post_logs_skyeye";
+				log_producer_sendTestLog_loki("RVCLogSDK", buffer->uuid[i], dstLog.c_str());
+			}
 		}
+		*/
 		
         result->statusCode = res;
 

Framework/RvcLogSdk/log_builder.cpp

@@ -249,14 +249,15 @@ int add_log(log_group_builder* bder, long start_time, uint32_t pack_index, log_i
 
 
     if (bder->grp->n_logs >= MAX_LOG_COUNT) {
-        log_producer_sendTestLog_loki("RVCLogSDK", bder->grp->logs[bder->grp->n_logs].uuid, "discard log");
         return -1;
     }
     
     memset(bder->grp->logs[bder->grp->n_logs].uuid, 0, MAX_UUID_LEN);
     get_format_uuid(bder->grp->logs[bder->grp->n_logs].uuid, MAX_UUID_LEN);
-    std::string dstLog = std::to_string(pack_index) + " add_log " + std::string(bder->grp->logs[bder->grp->n_logs].uuid);
+    /*
+    std::string dstLog = std::to_string(pack_index) + " add_log_skyeye " + std::string(bder->grp->logs[bder->grp->n_logs].uuid);
     log_producer_sendTestLog_loki("RVCLogSDK", bder->grp->logs[bder->grp->n_logs].uuid, dstLog.c_str());
+    */
     now = record_time;
 
     skyeye_content = cJSON_CreateObject();
@@ -1008,6 +1009,16 @@ void serialize_to_buf(build_item* log, serialize_buf* buf) {
     memcpy(buf->uuid, log->uuid, MAX_UUID_LEN);
     buf->buffer_len = log->buffer_len;
     memcpy(buf->buffer, log->buffer, log->buffer_len > sizeof(buf->buffer) - 1 ? sizeof(buf->buffer) - 1 : log->buffer_len);
-    std::string dstLog = std::string(buf->uuid) + " flush_log serialize_to_buf";
-    log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
+    /*
+    if (buf->type == LOG_TYPE_BEIDOU)
+    {
+        std::string dstLog = std::string(buf->uuid) + " flush_log_beidou";
+        log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
+    }
+    else
+    {
+        std::string dstLog = std::string(buf->uuid) + " flush_log_skyeye";
+        log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
+    }
+    */
 }

Framework/RvcLogSdk/log_db.cpp

@@ -392,8 +392,6 @@ int db_insert_one(log_db_manager* manager, serialize_buf* buf) {
 			append(strLevel).append(",").append(strType).append(",'").
 			append((char*)output_str_data).append("',").append(strEncrypt).append(",0)");
 
-		std::string dstLog = std::string(buf->uuid) + " db_insert_one encrypt2";
-		log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
 		if(compress_str_data)
 			free(compress_str_data);
 		if(output_data)
@@ -434,9 +432,19 @@ int db_insert_one(log_db_manager* manager, serialize_buf* buf) {
 		if(decoded_bytes)
 			free(decoded_bytes);
 		*/
+		/*
+		if (buf->type == LOG_TYPE_BEIDOU)
+		{
+			std::string dstLog = std::string(buf->uuid) + " db_insert_one_beidou encrypt3";
+			log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
+		}
+		else
+		{
+			std::string dstLog = std::string(buf->uuid) + " db_insert_one_skyeye encrypt3";
+			log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
+		}
+		*/
 		
-		std::string dstLog = std::string(buf->uuid) + " db_insert_one encrypt3";
-		log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
 
 		strSql.append(manager->table_name).append("(" + COLUMN_DateTime +
 			"," + COLUMN_Uuid + "," + COLUMN_Level + "," + COLUMN_Type + "," + COLUMN_Content + "," + COLUMN_Encrypt + "," + COLUMN_Status +

Framework/RvcLogSdk/log_producer_client.cpp

@@ -168,9 +168,11 @@ log_producer_result log_producer_client_add_beidou_log(log_producer_client* clie
         return LOG_PRODUCER_OK;
     }
     manager = ((producer_client_private*)client->private_data)->producer_manager;
+    /* beidou has no pack index
     CS_ENTER(manager->lock);
     manager->pack_index++;
     CS_LEAVE(manager->lock);
+    */
 
     //日志放入内存缓存，再发送
     rst = log_producer_manager_add_beidou_log(manager, log, flush);