X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Flog.c;h=342c0d25cd936b5e625546414e5f081891d4240d;hb=e4e8c6b082bea8a80003024b24f1d002cbc0fcb1;hp=e3f0cf45a736f6ec4671e52a60ca497ef864954f;hpb=43d8cf6fad25ed8d53be38f824739c59a3aff716;p=vpp.git diff --git a/src/vlib/log.c b/src/vlib/log.c index e3f0cf45a73..342c0d25cd9 100644 --- a/src/vlib/log.c +++ b/src/vlib/log.c @@ -172,8 +172,8 @@ syslog: } -vlib_log_class_t -vlib_log_register_class (char *class, char *subclass) +static vlib_log_class_t +vlib_log_register_class_internal (char *class, char *subclass, u32 limit) { vlib_log_main_t *lm = &log_main; vlib_log_class_data_t *c = NULL; @@ -199,12 +199,26 @@ vlib_log_register_class (char *class, char *subclass) vec_add2 (c->subclasses, s, 1); s->index = s - c->subclasses; s->name = subclass ? format (0, "%s", subclass) : 0; - s->rate_limit = lm->default_rate_limit; + s->rate_limit = (limit == 0) ? lm->default_rate_limit : limit; s->level = lm->default_log_level; s->syslog_level = lm->default_syslog_log_level; return (c->index << 16) | (s->index); } +vlib_log_class_t +vlib_log_register_class (char *class, char *subclass) +{ + return vlib_log_register_class_internal (class, subclass, + 0 /* default rate limit */ ); +} + +vlib_log_class_t +vlib_log_register_class_rate_limit (char *class, char *subclass, u32 limit) +{ + return vlib_log_register_class_internal (class, subclass, limit); +} + + u8 * format_vlib_log_level (u8 * s, va_list * args) { @@ -265,7 +279,7 @@ show_log (vlib_main_t * vm, while (count--) { e = vec_elt_at_index (lm->entries, i); - vlib_cli_output (vm, "%U %-10U %-10U %v", + vlib_cli_output (vm, "%U %-10U %-14U %v", format_time_float, 0, e->timestamp + time_offset, format_vlib_log_level, e->level, format_vlib_log_class, e->class, e->string);