print log level when dump mclag status

Signed-off-by: shine.chen <shine.chen@mediatek.com>
sonic-net · Nov 5, 2019 · 0b08967 · 0b08967
1 parent bc194ea
commit 0b08967
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/src/iccpd/include/logger.h b/src/iccpd/include/logger.h
@@ -59,6 +59,7 @@ struct LoggerConfig
 
 struct LoggerConfig* logger_get_configuration();
 void logger_set_configuration(int log_level);
+char* log_level_to_string(int level);
 void log_setup(char* progname, char* path);
 void log_finalize();
 void log_init(struct CmdOptionParser* parser);

diff --git a/src/iccpd/src/iccp_cmd_show.c b/src/iccpd/src/iccp_cmd_show.c
@@ -40,6 +40,7 @@ int iccp_mclag_config_dump(char * *buf,  int *num, int mclag_id)
     struct CSM *csm = NULL;
     struct LocalInterface *peer_link_if = NULL;
     struct LocalInterface *lif_po = NULL;
+    struct LoggerConfig* logconfig;
     char unknown[] = { "Unknown" };
     int mclag_num = 0;
     int id_exist = 0;
@@ -92,6 +93,9 @@ int iccp_mclag_config_dump(char * *buf,  int *num, int mclag_id)
         if (peer_link_if)
             memcpy(state_info.peer_link_mac, peer_link_if->mac_addr, 6);
 
+        logconfig = logger_get_configuration();
+        memcpy(state_info.loglevel, log_level_to_string(logconfig->log_level), strlen( log_level_to_string(logconfig->log_level)));
+
         state_info.role = csm->role_type;
 
         str_size = MCLAGDCTL_PORT_MEMBER_BUF_LEN;

diff --git a/src/iccpd/src/logger.c b/src/iccpd/src/logger.c
@@ -38,7 +38,7 @@ static uint32_t _iccpd_log_level_map[] =
     LOG_DEBUG,
 };
 
-static char* log_level_to_string(int level)
+char* log_level_to_string(int level)
 {
     switch (level)
     {

diff --git a/src/iccpd/src/mclagdctl/mclagdctl.c b/src/iccpd/src/mclagdctl/mclagdctl.c
@@ -266,6 +266,7 @@ int mclagdctl_parse_dump_state(char *msg, int data_len)
 
         fprintf(stdout, "%s: %s\n", "MCLAG Interface", state_info->enabled_po);
 
+        fprintf(stdout, "%s: %s\n", "Loglevel", state_info->loglevel);
     }
 
     return 0;
@@ -541,9 +542,9 @@ int mclagdctl_parse_config_loglevel(char *msg, int data_len)
     int ret = *(int*)msg;
 
     if (ret == 0)
-    fprintf(stdout, "%s\n", "Set mclag config debug level success!");
-    else 
-    fprintf(stdout, "%s\n", "Set mclag config debug level failed!");
+        fprintf(stdout, "%s\n", "Config loglevel success!");
+    else
+        fprintf(stdout, "%s\n", "Config loglevel failed!");
 
     return 0;
 }
@@ -706,7 +707,7 @@ int main(int argc, char **argv)
     char *data;
     struct mclagd_reply_hdr *reply;
 
-    while ((opt = getopt_long(argc, argv, "hil:", long_options, NULL)) >= 0)
+    while ((opt = getopt_long(argc, argv, "hi:l:", long_options, NULL)) >= 0)
     {
         switch (opt)
         {

diff --git a/src/iccpd/src/mclagdctl/mclagdctl.h b/src/iccpd/src/mclagdctl/mclagdctl.h
@@ -126,6 +126,7 @@ struct mclagd_state
     unsigned char peer_link_mac[MCLAGDCTL_ETHER_ADDR_LEN];
     int role;
     char enabled_po[MCLAGDCTL_PORT_MEMBER_BUF_LEN];
+    char loglevel[MCLAGDCTL_PARA1_LEN];
 };
 
 struct mclagd_arp_msg