🎈 perf: 优化bridge节点日志输出格式v4.6.16-20230310

优化bridge节点日志输出格式

5 files changed, 48 insertions, 29 deletions

diff --git a/service/src/node_bridge.c b/service/src/node_bridge.c
index dbfacc9..2e02e7a 100644
--- a/service/src/node_bridge.c
+++ b/service/src/node_bridge.c
@@ -148,9 +148,7 @@ void dump_bridge_config(struct node_bridge_main * bridge_main)
     if (bridge_main->nr_bridge == 0)
         return;
 
-    MR_INFO(" ");
-    MR_INFO("Bridge config :");
-    MR_INFO("Total num     : %u", bridge_main->nr_bridge);
+    MR_INFO("Bridge config total num: %u", bridge_main->nr_bridge);
 
     for (int index = BRIDGE_START_INDEX; index <= bridge_main->nr_bridge; index++)
     {
@@ -163,7 +161,7 @@ void dump_bridge_config(struct node_bridge_main * bridge_main)
                     RTE_ETHER_ADDR_BYTES(&_bridge_item->ether_addr[i]));
             strcat(str_section, str_devices);
         }
-        MR_INFO(" Bridge index : %d, Devices = %s", index - 1, str_section);
+        MR_INFO("Bridge index : %d, devices = %s", index - 1, str_section);
     }
 }
 
diff --git a/service/src/node_classifier.c b/service/src/node_classifier.c
index 8a37ef5..4001f73 100644
--- a/service/src/node_classifier.c
+++ b/service/src/node_classifier.c
@@ -1073,7 +1073,7 @@ void check_fast_match_condition(struct classifier_management * _classifier_manag
 void dump_classifier_rules(struct classifier_management * _classifier_management)
 {
     /* Dump the classifier rules */
-    MR_INFO(" ");
+    MR_INFO("\n");
 
     /* Because the valid rule id from 1 start,the id 0 is invalid */
     for (uint32_t i = MR_CLASSIFIER_START_RULE_ID; i < SINGLE_TABLE_MAX_RULE_ITEM_NUM; i++)
diff --git a/service/src/node_health_check.c b/service/src/node_health_check.c
index d4d3caa..af5dba8 100644
--- a/service/src/node_health_check.c
+++ b/service/src/node_health_check.c
@@ -289,10 +289,10 @@ void private_health_check_func(struct health_check_session * _session)
     switch (remote_state)
     {
     case REMOTE_UP:
-        MR_INFO("Health check '%s', device '%s' remote state: Up", _session->name, _session->device);
+        MR_INFO("Health check: %-25s, device: %-20s, remote state: Up", _session->name, _session->device);
         break;
     case REMOTE_DOWN:
-        MR_INFO("Health check '%s', device '%s' remote state: Down", _session->name, _session->device);
+        MR_INFO("Health check: %-25s, device: %-20s, remote state: Down", _session->name, _session->device);
         break;
     }
 }
@@ -426,21 +426,32 @@ int parse_health_check_config(struct sc_main * sc, struct health_check_main * _h
 }
 
 /* Dump the health check session */
-void dump_health_check_session(struct health_check_session * _session)
+void dump_health_check_session(struct health_check_session * _session, int session_id)
 {
-    MR_INFO("     Session name    : %s", _session->name);
-    MR_INFO("     Device name     : %s", _session->device);
-    MR_INFO("     Port id         : %u", _session->port_id);
+    char str_option[8192] = {};
+    char str_session_info[8192] = {};
+
+    sprintf(str_session_info, "Health check session id: %-4u", session_id);
+    sprintf(str_option, ", session name: %-30s", _session->name);
+    strcat(str_session_info, str_option);
+    sprintf(str_option, ", device name: %-20s", _session->device);
+    strcat(str_session_info, str_option);
+    sprintf(str_option, ", device id: %-3u", _session->port_id);
+    strcat(str_session_info, str_option);
 
     switch (_session->method)
     {
     case HEALTH_CHECK_PRIVATE: {
-        MR_INFO("     Method          : private");
-        MR_INFO("     Multiplier      : %u", _session->private_target.multiplier);
-        MR_INFO("     Interval        : %u", _session->private_target.interval);
+        sprintf(str_option, ",  method: private");
+        strcat(str_session_info, str_option);
+        sprintf(str_option, ", multiplier: %-3u", _session->private_target.multiplier);
+        strcat(str_session_info, str_option);
+        sprintf(str_option, ", interval: %u", _session->private_target.interval);
+        strcat(str_session_info, str_option);
     }
     break;
     }
+    MR_INFO("%s", str_session_info);
 }
 
 /* Dump the health check config */
@@ -449,15 +460,13 @@ void dump_health_check_config(struct health_check_main * _health_check_main)
     if (_health_check_main->total_session_num == 0)
         return;
 
+    MR_INFO("\n");
     /* Dump the health check config */
-    MR_INFO(" ");
-    MR_INFO("Health Check:");
-    MR_INFO("   Total session total number    : %u", _health_check_main->total_session_num);
+    MR_INFO("Health check session total number: %u", _health_check_main->total_session_num);
     for (int index = 0; index < _health_check_main->total_session_num; index++)
     {
         struct health_check_session * _session = &_health_check_main->sessions[index];
-        MR_INFO("    Shmdev session id: %d", index);
-        dump_health_check_session(_session);
+        dump_health_check_session(_session, index);
     }
 }
 
diff --git a/service/src/node_lb.c b/service/src/node_lb.c
index 3ba0c45..b48487b 100644
--- a/service/src/node_lb.c
+++ b/service/src/node_lb.c
@@ -390,6 +390,7 @@ void dump_lb_config(struct lb_management * lb_manage)
     if (lb_manage->nr_group == 0)
         return;
 
+    MR_INFO("\n");
     MR_INFO("LB config, total num: %u, sid num:%u, sid range start:%u, sid range end: %u", lb_manage->nr_group,
             lb_manage->nr_sid, lb_manage->sid_range_start, lb_manage->sid_range_end);
 
diff --git a/service/src/vdev.c b/service/src/vdev.c
index 3044e65..074845d 100644
--- a/service/src/vdev.c
+++ b/service/src/vdev.c
@@ -211,25 +211,36 @@ int vdev_main_init(struct sc_main * sc)
 
 int vdev_dump(struct sc_main * sc)
 {
-    MR_INFO(" ");
+    MR_INFO("\n");
     for (int i = 0; i < sc->vdev_main->vdev_max_idx; i++)
     {
+        char str_option[256] = {};
+        char str_vdev_info[256] = {};
         struct _vdev * _vdev_iter = sc->vdev_main->_vdev_array[i];
-        MR_INFO("Virtual Device %s:", _vdev_iter->vdev.symbol);
-        MR_INFO("   RX thread count                : %d", _vdev_iter->nr_rxstream);
-        MR_INFO("   TX thread count                : %d", _vdev_iter->nr_txstream);
-        MR_INFO("   Packet deliver ring size       : %d", _vdev_iter->sz_tunnel);
-        MR_INFO("   Packet deliver buffer size     : %d", _vdev_iter->sz_buffer);
+
+        sprintf(str_vdev_info, "Virtual Device: %-20s", _vdev_iter->vdev.symbol);
+        sprintf(str_option, ", rx thread count: %-3d", _vdev_iter->nr_rxstream);
+        strcat(str_vdev_info, str_option);
+        sprintf(str_option, ", tx thread count: %-3d", _vdev_iter->nr_txstream);
+        strcat(str_vdev_info, str_option);
+        sprintf(str_option, ", packet deliver ring size: %-10d", _vdev_iter->sz_tunnel);
+        strcat(str_vdev_info, str_option);
+        sprintf(str_option, ", packet deliver buffer size: %-10d", _vdev_iter->sz_buffer);
+        strcat(str_vdev_info, str_option);
 
         /* IP地址没有配置，忽略IP类信息的输出 */
         if (_vdev_iter->vdev.in_addr.s_addr != 0)
         {
-            MR_INFO("   IP Address                     : %s", inet_ntoa(_vdev_iter->vdev.in_addr));
-            MR_INFO("   Subnet mask                    : %s", inet_ntoa(_vdev_iter->vdev.in_mask));
-            MR_INFO("   Gateway                        : %s", inet_ntoa(_vdev_iter->vdev.in_gateway));
+
+            sprintf(str_option, ", ip address : %-16s", inet_ntoa(_vdev_iter->vdev.in_addr));
+            strcat(str_vdev_info, str_option);
+            sprintf(str_option, ", subnet mask : %-4s", inet_ntoa(_vdev_iter->vdev.in_addr));
+            strcat(str_vdev_info, str_option);
+            sprintf(str_option, ", gateway : %-16s", inet_ntoa(_vdev_iter->vdev.in_gateway));
+            strcat(str_vdev_info, str_option);
         }
 
-        MR_INFO(" ");
+        MR_INFO("%s", str_vdev_info);
     }
 
     return 0;