增加流程日志文件记录功能

message/log_process.proto

@@ -7,38 +7,30 @@ import "dispatch_message.proto";                //调度消息
 import "central_control_message.proto";         //手动操作消息
 
 
-//车位数据节点日志
-message Parkspace_data
+//与节点通讯数据，请求反馈数据
+message Node_log
 {
-    optional    Parkspace_allocation_request_msg    alloc_request=1;
-    optional    Parkspace_allocation_response_msg   alloc_response=2;
-    optional    Parkspace_search_request_msg        search_request=3;
-    optional    Parkspace_search_response_msg       search_response=4;
-
-    optional    Parkspace_release_request_msg       release_request=5;
-    optional    Parkspace_release_response_msg      release_response=6;
-
-    optional    Parkspace_confirm_alloc_request_msg     confirm_request=7;
-    optional    Parkspace_confirm_alloc_response_msg    confirm_response=8;
-    optional    string                      description=9;
-}
-
-message Measure_data
-{
-    optional    Measure_request_msg                 request=1;
-    optional    Measure_response_msg                response=2;
-    optional    string                              description=3;
-}
-
-message Dispatch_data
-{
-    optional    Dispatch_request_msg                request=1;
-    optional    Dispatch_response_msg               response=2;
-    optional    string                              description=3;
+    oneof   request{
+        Parkspace_allocation_request_msg    alloc_request=1;
+        Parkspace_search_request_msg        search_request=3;
+        Parkspace_release_request_msg       release_request=5;
+        Parkspace_confirm_alloc_request_msg     confirm_request=7;
+        Measure_request_msg                 measure_request=9;
+        Dispatch_request_msg                dispatch_request=11;
+    }
+    oneof   response{
+        Parkspace_allocation_response_msg   alloc_response=2;
+        Parkspace_search_response_msg       search_response=4;
+        Parkspace_release_response_msg      release_response=6;
+        Parkspace_confirm_alloc_response_msg    confirm_response=8;
+        Measure_response_msg                measure_response=10;
+        Dispatch_response_msg               dispatch_response=12;
+    }
+    optional string         description=13;
 }
 
-
-message Manual_operation_data
+//手动操作数据
+message Manual_operation_log
 {
     required    Process_manual_operation_msg        manual_operation=1;
     optional    string                              description=2;
@@ -55,10 +47,8 @@ message Log_data
     required Severity      log_severity=1;
     oneof    data               {
             string          str_log=2;
-            Parkspace_data  parkspace_log=3;
-            Measure_data    measure_log=4;
-            Dispatch_data   dispatch_log=5;
-            Manual_operation_data   manual_operator_log=6;
+            Node_log        node_log=3;
+            Manual_operation_log    manual_operator_log=4;
     }
 }
 

system/PickupProcessTask.cpp

@@ -114,10 +114,10 @@ Error_manager PickupProcessTask::search_space_step()
     code = Parkspace_excutor::get_instance_pointer()->search_request(m_search_request_msg,
             m_search_response_msg,m_cancel_condition);
 
-    message::Parkspace_data search_data;
-    search_data.mutable_search_request()->CopyFrom(m_search_request_msg);
-    search_data.mutable_search_response()->CopyFrom(m_search_response_msg);
-    ALOG(INFO)<<search_data;
+    message::Node_log node_log;
+    node_log.mutable_search_request()->CopyFrom(m_search_request_msg);
+    node_log.mutable_search_response()->CopyFrom(m_search_response_msg);
+    ALOG(INFO)<<node_log;
 
     return code;
 }
@@ -369,10 +369,10 @@ Error_manager PickupProcessTask::dispatch_step()
     m_dispatch_request_msg.set_terminal_id(m_terminor_id);
 
     code=Dispatch_excutor::get_instance_pointer()->dispatch_request(m_dispatch_request_msg,m_dispatch_response_msg,m_cancel_condition);
-    message::Dispatch_data dispatch_data;
-    dispatch_data.mutable_request()->CopyFrom(m_dispatch_request_msg);
-    dispatch_data.mutable_response()->CopyFrom(m_dispatch_response_msg);
-    ALOG(INFO)<<dispatch_data;
+    message::Node_log dispatch_log;
+    dispatch_log.mutable_dispatch_request()->CopyFrom(m_dispatch_request_msg);
+    dispatch_log.mutable_dispatch_response()->CopyFrom(m_dispatch_response_msg);
+    ALOG(INFO)<<dispatch_log;
 
     if(code!=SUCCESS)
         return code;
@@ -454,10 +454,10 @@ Error_manager PickupProcessTask::release_space_step()
     m_release_request_msg.mutable_release_space_info()->CopyFrom(space_info);
 
     code=Parkspace_excutor::get_instance_pointer()->release_request(m_release_request_msg,m_release_response_msg,m_cancel_condition);
-    message::Parkspace_data release_data;
-    release_data.mutable_release_request()->CopyFrom(m_release_request_msg);
-    release_data.mutable_release_response()->CopyFrom(m_release_response_msg);
-    ALOG(INFO)<<release_data;
+    message::Node_log node_log;
+    node_log.mutable_release_request()->CopyFrom(m_release_request_msg);
+    node_log.mutable_release_response()->CopyFrom(m_release_response_msg);
+    ALOG(INFO)<<node_log;
 
     if(code!=SUCCESS)
         return code;
@@ -485,11 +485,6 @@ void PickupProcessTask::publish_step_status() {
      */
 void PickupProcessTask::updata_step_statu(message::Step_statu statu)
 {
-    if(m_current_step_statu!=statu)
-    {
-        ALOG(INFO) << "切换当前步骤状态:" << message::Step_statu_Name(m_current_step_statu)
-                   << " -->" << message::Step_statu_Name(statu);
-    }
     m_current_step_statu=statu;
     std::lock_guard<std::mutex>         lock(m_process_msg_lock);
     switch (m_current_step_type) {

system/StoreProcessTask.cpp

@@ -72,10 +72,10 @@ Error_manager StoreProcessTask::locate_step() {
 
     code=Measure_excutor::get_instance_pointer()->locate_request(m_measure_request_msg,
             m_measure_response_msg,m_cancel_condition);
-    message::Measure_data measure_data;
-    measure_data.mutable_request()->CopyFrom(m_measure_request_msg);
-    measure_data.mutable_response()->CopyFrom(m_measure_response_msg);
-    ALOG(INFO)<<measure_data;
+    message::Node_log node_log;
+    node_log.mutable_measure_request()->CopyFrom(m_measure_request_msg);
+    node_log.mutable_measure_response()->CopyFrom(m_measure_response_msg);
+    ALOG(INFO)<<node_log;
 
     if(code!=SUCCESS)
         return code;
@@ -155,10 +155,10 @@ Error_manager StoreProcessTask::dispatch_step()
     code=Dispatch_excutor::get_instance_pointer()->dispatch_request(m_dispatch_request_msg,
             m_dispatch_response_msg,m_cancel_condition);
     //记录
-    message::Dispatch_data dispatch_data;
-    dispatch_data.mutable_request()->CopyFrom(m_dispatch_request_msg);
-    dispatch_data.mutable_response()->CopyFrom(m_dispatch_response_msg);
-    ALOG(INFO)<<dispatch_data;
+    message::Node_log node_log;
+    node_log.mutable_dispatch_request()->CopyFrom(m_dispatch_request_msg);
+    node_log.mutable_dispatch_response()->CopyFrom(m_dispatch_response_msg);
+    ALOG(INFO)<<node_log;
 
     if(code!=SUCCESS)
         return code;
@@ -247,10 +247,10 @@ Error_manager StoreProcessTask::alloc_space_step()
             m_parcspace_alloc_response_msg,m_cancel_condition);
 
     //记录日志
-    message::Parkspace_data parkspace_data;
-    parkspace_data.mutable_alloc_request()->CopyFrom(m_alloc_request_msg);
-    parkspace_data.mutable_alloc_response()->CopyFrom(m_parcspace_alloc_response_msg);
-    ALOG(INFO)<<parkspace_data;
+    message::Node_log node_log;
+    node_log.mutable_alloc_request()->CopyFrom(m_alloc_request_msg);
+    node_log.mutable_alloc_response()->CopyFrom(m_parcspace_alloc_response_msg);
+    ALOG(INFO)<<node_log;
 
     if(code!=SUCCESS)
     {
@@ -302,10 +302,10 @@ Error_manager StoreProcessTask::confirm_space_step()
     message::Parkspace_confirm_alloc_response_msg confirm_response;
     code=Parkspace_excutor::get_instance_pointer()->confirm_request(request,confirm_response,m_cancel_condition);
     //记录日志
-    message::Parkspace_data confirm_data;
-    confirm_data.mutable_confirm_request()->CopyFrom(request);
-    confirm_data.mutable_confirm_response()->CopyFrom(confirm_response);
-    ALOG(INFO)<<confirm_data;
+    message::Node_log node_log;
+    node_log.mutable_confirm_request()->CopyFrom(request);
+    node_log.mutable_confirm_response()->CopyFrom(confirm_response);
+    ALOG(INFO)<<node_log;
 
     if(code!=SUCCESS)
         return code;
@@ -368,11 +368,11 @@ Error_manager StoreProcessTask::back_alloc_space_step()
     code=Parkspace_excutor::get_instance_pointer()->release_request(request,release_response,m_cancel_condition);
 
     //记录
-    message::Parkspace_data release_data;
-    release_data.mutable_release_request()->CopyFrom(request);
-    release_data.mutable_release_response()->CopyFrom(release_response);
-    release_data.set_description("回退分配步骤，释放车位");
-    ALOG(INFO)<<release_data;
+    message::Node_log node_log;
+    node_log.mutable_release_request()->CopyFrom(request);
+    node_log.mutable_release_response()->CopyFrom(release_response);
+    node_log.set_description("回退分配步骤，释放车位");
+    ALOG(INFO)<<node_log;
 
     if(code!=SUCCESS)
         return Error_manager(code.get_error_code(),MAJOR_ERROR,code.get_error_description());
@@ -655,11 +655,6 @@ void StoreProcessTask::publish_step_status() {
      */
 void StoreProcessTask::updata_step_statu(message::Step_statu statu)
 {
-    if(m_current_step_statu!=statu)
-    {
-        ALOG(INFO) << "切换当前步骤状态:" << message::Step_statu_Name(m_current_step_statu)
-                               << " -->" << message::Step_statu_Name(statu);
-    }
     m_current_step_statu=statu;
     std::lock_guard<std::mutex>         lock(m_process_msg_lock);
     switch (m_current_step_type) {

system/process_task.cpp

@@ -73,28 +73,14 @@ void Process_task::add_log(int severity,std::string log)
     m_process_log.mutable_log_data()->Add(std::move(log_data));
 }
 //以下是节点日志
-void Process_task::add_log(int severity,const message::Parkspace_data& data)
+void Process_task::add_log(int severity,const message::Node_log& data)
 {
     message::Log_data log_data;
     log_data.set_log_severity(message::Log_data_Severity(severity));
-    log_data.mutable_parkspace_log()->CopyFrom(data);
+    log_data.mutable_node_log()->CopyFrom(data);
     m_process_log.mutable_log_data()->Add(std::move(log_data));
 }
-void Process_task::add_log(int severity,const message::Measure_data& data)
-{
-    message::Log_data log_data;
-    log_data.set_log_severity(message::Log_data_Severity(severity));
-    log_data.mutable_measure_log()->CopyFrom(data);
-    m_process_log.mutable_log_data()->Add(std::move(log_data));
-}
-void Process_task::add_log(int severity,const message::Dispatch_data& data)
-{
-    message::Log_data log_data;
-    log_data.set_log_severity(message::Log_data_Severity(severity));
-    log_data.mutable_dispatch_log()->CopyFrom(data);
-    m_process_log.mutable_log_data()->Add(std::move(log_data));
-}
-void Process_task::add_log(int severity,const message::Manual_operation_data& data)
+void Process_task::add_log(int severity,const message::Manual_operation_log& data)
 {
     message::Log_data log_data;
     log_data.set_log_severity(message::Log_data_Severity(severity));

system/process_task.h

@@ -102,22 +102,12 @@ protected:
             m_str+=buf;
             return *this;
         }
-        Log_container& operator<<(const message::Parkspace_data& data) {
+        Log_container& operator<<(const message::Node_log& data) {
             if(m_process)
                 m_process->add_log(m_severity,data);
             return *this;
         }
-        Log_container& operator<<(const message::Measure_data& data) {
-            if(m_process)
-                m_process->add_log(m_severity,data);
-            return *this;
-        }
-        Log_container& operator<<(const message::Dispatch_data& data) {
-            if(m_process)
-                m_process->add_log(m_severity,data);
-            return *this;
-        }
-        Log_container& operator<<(const message::Manual_operation_data& data) {
+        Log_container& operator<<(const message::Manual_operation_log& data) {
             if(m_process)
                 m_process->add_log(m_severity,data);
             return *this;
@@ -161,10 +151,8 @@ protected:
     //普通日志
     void add_log(int severity,std::string log);
     //以下是节点日志
-    void add_log(int severity,const message::Parkspace_data& data);
-    void add_log(int severity,const message::Measure_data& data);
-    void add_log(int severity,const message::Dispatch_data& data);
-    void add_log(int severity,const message::Manual_operation_data& data);
+    void add_log(int severity,const message::Node_log& data);
+    void add_log(int severity,const message::Manual_operation_log& data);
 
 #define ALOG(severity)    Log_container_##severity(this)
 #define ALOG_IF(severity,condition)  Log_container_##severity(this,condition)

test/terminal_client.cpp

@@ -111,9 +111,6 @@ int main() {
     int license_id = rand()%90000+10000;
     while (c!='q') {
 
-        std::cout<<" press any key to send command"<<std::endl;
-        std::cin>>c;
-
         char C=rand()%10+'A';
         char license[255] = {0};
         sprintf(license, "鄂%c%d",C, license_id++);
@@ -133,6 +130,12 @@ int main() {
             usleep(1000*500*in_count);
             std::this_thread::yield();
         }
+
+        if(n%20==0)
+        {
+            std::cout << " press any key to send command" << std::endl;
+            std::cin >> c;
+        }
     }
 }