From: Su Wang <su.z.wang@ericsson.com>
Date: Fri, 11 Jan 2019 17:46:05 +0000 (-0500)
Subject: log: bug fix register class compare mismatch
X-Git-Tag: v19.04-rc1~649
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=34321b3445b77f2624475d18a6483db6fd0d7e94

log: bug fix register class compare mismatch

1. Otherwise, the log classes with same prefix, e.g. "abc" and
   "abc-de" will all be registered into log class "abc";
2. Minor improvement for test log help string.

Change-Id: I8d93be5e8fa67db6012198b3442a9e2bddcb744a
Signed-off-by: Su Wang <su.z.wang@ericsson.com>
---

diff --git a/src/vlib/log.c b/src/vlib/log.c
index 76490fcd3bc..9a0d75fe3ac 100644
--- a/src/vlib/log.c
+++ b/src/vlib/log.c
@@ -232,6 +232,8 @@ vlib_log_register_class (char *class, char *subclass)
   vlib_log_class_data_t *tmp;
   vec_foreach (tmp, lm->classes)
   {
+    if (vec_len (tmp->name) != strlen (class))
+      continue;
     if (!memcmp (class, tmp->name, vec_len (tmp->name)))
       {
 	c = tmp;
@@ -689,7 +691,7 @@ test_log_class_subclass (vlib_main_t * vm,
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (cli_test_log, static) = {
   .path = "test log",
-  .short_help = "test log <class> <subclass> <level> <message",
+  .short_help = "test log <level> <class> <subclass> <message>",
   .function = test_log_class_subclass,
 };
 /* *INDENT-ON* */