X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Flog.c;h=fc67a1f8903fd244f816a481a3beaa62b56e991e;hb=694046cf8eef9c8ec1313ebe8327bfebc2a11522;hp=27d2e16b006c85051f21cb3cebdf4aa6b1584676;hpb=055e64066d88576ed516e5f50de7ec3d5b6cef0a;p=vpp.git diff --git a/src/vlib/log.c b/src/vlib/log.c index 27d2e16b006..fc67a1f8903 100644 --- a/src/vlib/log.c +++ b/src/vlib/log.c @@ -18,15 +18,23 @@ #include #include #include +#include vlib_log_main_t log_main = { .default_log_level = VLIB_LOG_LEVEL_NOTICE, .default_syslog_log_level = VLIB_LOG_LEVEL_WARNING, .unthrottle_time = 3, .size = 512, + .add_to_elog = 1, .default_rate_limit = 50, }; +/* *INDENT-OFF* */ +VLIB_REGISTER_LOG_CLASS (log_log, static) = { + .class_name = "log", +}; +/* *INDENT-ON* */ + static const int colors[] = { [VLIB_LOG_LEVEL_EMERG] = 1, /* red */ [VLIB_LOG_LEVEL_ALERT] = 1, /* red */ @@ -38,6 +46,18 @@ static const int colors[] = { [VLIB_LOG_LEVEL_DEBUG] = 6, /* cyan */ }; +static const int log_level_to_syslog_priority[] = { + [VLIB_LOG_LEVEL_EMERG] = LOG_EMERG, + [VLIB_LOG_LEVEL_ALERT] = LOG_ALERT, + [VLIB_LOG_LEVEL_CRIT] = LOG_CRIT, + [VLIB_LOG_LEVEL_ERR] = LOG_ERR, + [VLIB_LOG_LEVEL_WARNING] = LOG_WARNING, + [VLIB_LOG_LEVEL_NOTICE] = LOG_NOTICE, + [VLIB_LOG_LEVEL_INFO] = LOG_INFO, + [VLIB_LOG_LEVEL_DEBUG] = LOG_DEBUG, + [VLIB_LOG_LEVEL_DISABLED] = LOG_DEBUG, +}; + int last_log_entry () { @@ -65,22 +85,6 @@ get_subclass_data (vlib_log_class_t ci) return vec_elt_at_index (c->subclasses, (ci & 0xffff)); } -static int -vlib_log_level_to_syslog_priority (vlib_log_level_t level) -{ - switch (level) - { -#define LOG_DISABLED LOG_DEBUG -#define _(n,uc,lc) \ - case VLIB_LOG_LEVEL_##uc:\ - return LOG_##uc; - foreach_vlib_log_level -#undef _ -#undef LOG_DISABLED - } - return LOG_DEBUG; -} - u8 * format_vlib_log_class (u8 * s, va_list * args) { @@ -187,6 +191,7 @@ vlib_log (vlib_log_level_t level, vlib_log_class_t class, char *fmt, ...) indent = vec_len (l); } fmt = format (0, "%%-%uU [%%-6U]: ", lm->max_class_name_length); + vec_terminate_c_string (fmt); l = format (l, (char *) fmt, format_vlib_log_class, class, format_vlib_log_level, level); vec_free (fmt); @@ -200,7 +205,7 @@ vlib_log (vlib_log_level_t level, vlib_log_class_t class, char *fmt, ...) else { l = format (l, "%U", format_vlib_log_class, class); - int prio = vlib_log_level_to_syslog_priority (level); + int prio = log_level_to_syslog_priority[level]; int is_term = vec_c_string_is_terminated (l) ? 1 : 0; syslog (prio, "%.*s: %.*s", (int) vec_len (l), l, @@ -219,6 +224,37 @@ vlib_log (vlib_log_level_t level, vlib_log_class_t class, char *fmt, ...) e->timestamp = t; s = 0; + if (lm->add_to_elog) + { + /* *INDENT-OFF* */ + ELOG_TYPE_DECLARE(ee) = + { + .format = "log-%s: %s", + .format_args = "t4T4", + .n_enum_strings = 9, + .enum_strings = { + "emerg", + "alert", + "crit", + "err", + "warn", + "notice", + "info", + "debug", + "disabled", + }, + }; + struct { + u32 log_level; + u32 string_index; + } *ed; + /* *INDENT-ON* */ + ed = ELOG_DATA (&vlib_global_main.elog_main, ee); + ed->log_level = level; + ed->string_index = + elog_string (&vlib_global_main.elog_main, "%v", e->string); + } + lm->next = (lm->next + 1) % lm->size; if (lm->size > lm->count) lm->count++; @@ -262,8 +298,8 @@ vlib_log_register_class_internal (char *class, char *subclass, u32 limit) vec_add2 (lm->classes, c, 1); c->index = c - lm->classes; c->name = format (0, "%s", class); - length = vec_len (c->name); } + length = vec_len (c->name); vec_add2 (c->subclasses, s, 1); s->index = s - c->subclasses; @@ -321,7 +357,7 @@ format_vlib_log_level (u8 * s, va_list * args) switch (i) { -#define _(v,uc,lc) case VLIB_LOG_LEVEL_##uc: t = #lc; break; +#define _(uc,lc) case VLIB_LOG_LEVEL_##uc: t = #lc; break; foreach_vlib_log_level #undef _ default: @@ -334,12 +370,29 @@ static clib_error_t * vlib_log_init (vlib_main_t * vm) { vlib_log_main_t *lm = &log_main; + vlib_log_class_registration_t *r = lm->registrations; gettimeofday (&lm->time_zero_timeval, 0); lm->time_zero = vlib_time_now (vm); vec_validate (lm->entries, lm->size); - lm->log_class = vlib_log_register_class ("log", 0); + + while (r) + { + r->class = vlib_log_register_class (r->class_name, r->subclass_name); + if (r->default_level) + get_subclass_data (r->class)->level = r->default_level; + if (r->default_syslog_level) + get_subclass_data (r->class)->syslog_level = r->default_syslog_level; + r = r->next; + } + + r = lm->registrations; + while (r) + { + vlib_log_debug (r->class, "initialized"); + r = r->next; + } return 0; } @@ -448,7 +501,7 @@ clear_log (vlib_main_t * vm, lm->count = 0; lm->next = 0; - vlib_log_info (lm->log_class, "log cleared"); + vlib_log_info (log_log.class, "log cleared"); return error; } @@ -468,11 +521,11 @@ unformat_vlib_log_level (unformat_input_t * input, va_list * args) uword rv = 1; if (unformat (input, "%s", &level_str)) { -#define _(v, uc, lc) \ +#define _(uc, lc) \ const char __##uc[] = #lc; \ - if (!strcmp ((const char *) level_str, __##uc)) \ + if (!strcmp ((const char *) level_str, __##uc)) \ { \ - *level = VLIB_LOG_LEVEL_##uc; \ + *level = VLIB_LOG_LEVEL_##uc; \ rv = 1; \ goto done; \ } @@ -802,6 +855,8 @@ log_config (vlib_main_t * vm, unformat_input_t * input) unformat_vlib_log_level, &lm->default_syslog_log_level)) ; + else if (unformat (input, "add-to-elog")) + lm->add_to_elog = 1; else if (unformat (input, "class %s %U", &class, unformat_vlib_cli_sub_input, &sub_input)) {