From 4d446aefbe4aee2f7fc6297b647d90f1926f8055 Mon Sep 17 00:00:00 2001
From: Hu Chunming <2657262686@qq.com>
Date: Tue, 11 Jun 2024 11:20:23 +0800
Subject: [PATCH] 日志优化

---
 src/ai_platform/MultiSourceProcess.cpp            | 16 ++++++++--------
 src/decoder/gb28181/websocket/WebsocketClient.cpp | 13 ++++++-------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/ai_platform/MultiSourceProcess.cpp b/src/ai_platform/MultiSourceProcess.cpp
index 9463005..ee1e16f 100755
--- a/src/ai_platform/MultiSourceProcess.cpp
+++ b/src/ai_platform/MultiSourceProcess.cpp
@@ -1126,16 +1126,16 @@ void CMultiSourceProcess::vehicle_locus_finished(const OBJ_KEY obj_key) {
   }
   auto task_other_param = it_other_param->second;
 
-  LOG_DEBUG("algor_type");
+  // LOG_DEBUG("algor_type");
   auto algor_type = index_to_algo_type[obj_value.index.index];
 
-  LOG_DEBUG("task_other_param");
+  // LOG_DEBUG("task_other_param");
   auto it_algor_type = task_other_param.find(algor_type);
   if(it_algor_type == task_other_param.end()) {
     return;
   }
   
-  LOG_DEBUG("algor_param");
+  // LOG_DEBUG("algor_param");
   auto algor_param = (algor_config_param_snapshot *)it_algor_type->second->algor_param;
   if(algor_param == nullptr) {
     return;
@@ -1148,7 +1148,7 @@ void CMultiSourceProcess::vehicle_locus_finished(const OBJ_KEY obj_key) {
     return;
   }
 
-  LOG_DEBUG("cur_param");
+  // LOG_DEBUG("cur_param");
   const algor_basic_config_param_t *cur_param = it_algor_type->second->basic_param;
   // const algor_basic_config_param_t *cur_param = task_other_param[algor_type]->basic_param;
   if(cur_param == nullptr) {
@@ -1156,7 +1156,7 @@ void CMultiSourceProcess::vehicle_locus_finished(const OBJ_KEY obj_key) {
   }
   
   // 原图
-  LOG_DEBUG("原图");
+  // LOG_DEBUG("原图");
   std::string cur_timestamp_ms =  std::to_string(helpers::timer::get_cur_time_ms());
   std::string fpath_origin = std::string(cur_param->result_folder) + helpers::os::sep + obj_key.video_id + "_" +
                               std::to_string(obj_key.obj_id) + "_" + cur_timestamp_ms + ".jpg";
@@ -1168,7 +1168,7 @@ void CMultiSourceProcess::vehicle_locus_finished(const OBJ_KEY obj_key) {
   m_save_snapshot_reprocessing->reprocessing_process_wo_locus_async(origin_save_info);
 
   {
-    LOG_DEBUG("抠图");
+    // LOG_DEBUG("抠图");
     // 抠图
     string json_str = "";
     string object_file_name = std::string(cur_param->result_folder_little) + helpers::os::sep + obj_key.video_id + "_" +
@@ -1868,7 +1868,7 @@ void CMultiSourceProcess::village_snapshot(vector<string>& vpt_interest_task_id,
         for (int sp_idx = 0;  sp_idx < 3; sp_idx ++) {
           int num = sp_idx + 1;
           // 原图
-          LOG_DEBUG("原图"); 
+          // LOG_DEBUG("原图"); 
           std::string fpath_origin = result_folder + helpers::os::sep + obj_key.video_id + "_" +
                                       std::to_string(obj_key.obj_id) + "_" + cur_timestamp_ms + "_picnum_" + std::to_string(num) + ".jpg";
                                         
@@ -1879,7 +1879,7 @@ void CMultiSourceProcess::village_snapshot(vector<string>& vpt_interest_task_id,
           m_save_snapshot_reprocessing->reprocessing_process_wo_locus_async(origin_save_info);
 
           
-          LOG_DEBUG("抠图");
+          // LOG_DEBUG("抠图");
           // 抠图
           string object_file_name = result_folder_little + helpers::os::sep + obj_key.video_id + "_" +
                                     std::to_string(obj_key.obj_id) + "_" + cur_timestamp_ms + "_picnum_" + std::to_string(num) + ".jpg";                                   
diff --git a/src/decoder/gb28181/websocket/WebsocketClient.cpp b/src/decoder/gb28181/websocket/WebsocketClient.cpp
index 949544a..6b0cea5 100644
--- a/src/decoder/gb28181/websocket/WebsocketClient.cpp
+++ b/src/decoder/gb28181/websocket/WebsocketClient.cpp
@@ -12,17 +12,17 @@ using websocketpp::lib::placeholders::_2;
 
 void WebsocketClient::on_open(websocketpp::connection_hdl hdl)
 {
-    std::cout << "连接sip服务器成功！" << std::endl;
+    LOG_INFO( "连接sip服务器成功！");
     mbClosed = false;
 }
 
 void WebsocketClient::on_fail(websocketpp::connection_hdl h){
-    std::cout << "连接sip服务器失败！" << std::endl;
+    LOG_INFO( "连接sip服务器失败！");
     mbClosed = true;
 }
 
 void WebsocketClient::on_close(websocketpp::connection_hdl h){
-    std::cout << "on_close" << std::endl;
+    LOG_INFO( "on_close");
     mbClosed = true;
 }
 
@@ -33,7 +33,7 @@ void WebsocketClient::on_message(websocketpp::connection_hdl hdl, message_ptr ms
         // 返回执行结果
         // ws_server.send(hdl, to_string(ret), websocketpp::frame::opcode::text);
     } catch (websocketpp::exception const & e) {
-        std::cout << "Echo failed because: " << "(" << e.what() << ")" << std::endl;
+        LOG_ERROR( "Echo failed because:({})", e.what());
     }
 }
 
@@ -56,9 +56,7 @@ int WebsocketClient::msg_parser(websocketpp::connection_hdl hdl, string msg) {
             std::cout << "bye  invite: " << vec_msg[2] << std::endl;
         }
     } else {
-        std::cout << "on_message called with hdl: " << hdl.lock().get()
-            << " and message: " << msg
-            << std::endl;
+        LOG_ERROR( "on_message called with hdl:{}  and message:{}",hdl.lock().get(), msg);
     }
 
     return ret;
@@ -90,6 +88,7 @@ int WebsocketClient::init()
     }
     
     uri = "ws://" + mInfo.getWsIp() + ":" + to_string(mInfo.getWsPort());
+    LOG_INFO("{}", uri);
 
     m_client.set_access_channels(websocketpp::log::alevel::all);
     m_client.clear_access_channels(websocketpp::log::alevel::frame_payload);
--
libgit2 0.21.4