diff options
Diffstat (limited to 'src/vlib/log.c')
| -rw-r--r-- | src/vlib/log.c | 78 |
1 files changed, 21 insertions, 57 deletions
diff --git a/src/vlib/log.c b/src/vlib/log.c index fc67a1f8903..60fb9fb5178 100644 --- a/src/vlib/log.c +++ b/src/vlib/log.c @@ -25,15 +25,13 @@ vlib_log_main_t log_main = { .default_syslog_log_level = VLIB_LOG_LEVEL_WARNING, .unthrottle_time = 3, .size = 512, - .add_to_elog = 1, + .add_to_elog = 0, .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 */ @@ -70,27 +68,12 @@ last_log_entry () i += lm->size; return i; } - -static vlib_log_class_data_t * -get_class_data (vlib_log_class_t ci) -{ - vlib_log_main_t *lm = &log_main; - return vec_elt_at_index (lm->classes, (ci >> 16)); -} - -static vlib_log_subclass_data_t * -get_subclass_data (vlib_log_class_t ci) -{ - vlib_log_class_data_t *c = get_class_data (ci); - return vec_elt_at_index (c->subclasses, (ci & 0xffff)); -} - u8 * format_vlib_log_class (u8 * s, va_list * args) { vlib_log_class_t ci = va_arg (*args, vlib_log_class_t); - vlib_log_class_data_t *c = get_class_data (ci); - vlib_log_subclass_data_t *sc = get_subclass_data (ci); + vlib_log_class_data_t *c = vlib_log_get_class_data (ci); + vlib_log_subclass_data_t *sc = vlib_log_get_subclass_data (ci); if (sc->name) return format (s, "%v/%v", c->name, sc->name); @@ -105,7 +88,6 @@ format_indent (u8 * s, va_list * args) u32 indent = va_arg (*args, u32); u8 *c; - /* *INDENT-OFF* */ vec_foreach (c, v) { vec_add (s, c, 1); @@ -113,7 +95,6 @@ format_indent (u8 * s, va_list * args) for (u32 i = 0; i < indent; i++) vec_add1 (s, (u8) ' '); } - /* *INDENT-ON* */ return s; } @@ -133,7 +114,7 @@ vlib_log (vlib_log_level_t level, vlib_log_class_t class, char *fmt, ...) vlib_main_t *vm = vlib_get_main (); vlib_log_main_t *lm = &log_main; vlib_log_entry_t *e; - vlib_log_subclass_data_t *sc = get_subclass_data (class); + vlib_log_subclass_data_t *sc = vlib_log_get_subclass_data (class); va_list va; f64 t = vlib_time_now (vm); f64 delta = t - sc->last_event_timestamp; @@ -226,13 +207,13 @@ vlib_log (vlib_log_level_t level, vlib_log_class_t class, char *fmt, ...) if (lm->add_to_elog) { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE(ee) = + ELOG_TYPE_DECLARE(ee) = { .format = "log-%s: %s", .format_args = "t4T4", - .n_enum_strings = 9, + .n_enum_strings = VLIB_LOG_N_LEVELS, .enum_strings = { + "unknown", "emerg", "alert", "crit", @@ -244,15 +225,15 @@ vlib_log (vlib_log_level_t level, vlib_log_class_t class, char *fmt, ...) "disabled", }, }; - struct { - u32 log_level; - u32 string_index; - } *ed; - /* *INDENT-ON* */ + struct + { + u32 log_level; + u32 string_index; + } * ed; 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); + elog_string (&vlib_global_main.elog_main, "%v%c", e->string, 0); } lm->next = (lm->next + 1) % lm->size; @@ -366,8 +347,8 @@ format_vlib_log_level (u8 * s, va_list * args) return format (s, "%s", t); } -static clib_error_t * -vlib_log_init (vlib_main_t * vm) +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; @@ -381,9 +362,10 @@ vlib_log_init (vlib_main_t * vm) { 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; + vlib_log_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; + vlib_log_get_subclass_data (r->class)->syslog_level = + r->default_syslog_level; r = r->next; } @@ -396,9 +378,6 @@ vlib_log_init (vlib_main_t * vm) return 0; } -VLIB_INIT_FUNCTION (vlib_log_init); - - static clib_error_t * show_log (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) @@ -416,23 +395,20 @@ show_log (vlib_main_t * vm, while (count--) { e = vec_elt_at_index (lm->entries, i); - 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); + vlib_cli_output (vm, "%U %-10U %-14U %v", format_time_float, NULL, + e->timestamp + time_offset, format_vlib_log_level, + e->level, format_vlib_log_class, e->class, e->string); i = (i + 1) % lm->size; } return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_log, static) = { .path = "show logging", .short_help = "show logging", .function = show_log, }; -/* *INDENT-ON* */ static clib_error_t * show_log_config (vlib_main_t * vm, @@ -474,13 +450,11 @@ show_log_config (vlib_main_t * vm, return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_log_config, static) = { .path = "show logging configuration", .short_help = "show logging configuration", .function = show_log_config, }; -/* *INDENT-ON* */ static clib_error_t * clear_log (vlib_main_t * vm, @@ -505,13 +479,11 @@ clear_log (vlib_main_t * vm, return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_clear_log, static) = { .path = "clear logging", .short_help = "clear logging", .function = clear_log, }; -/* *INDENT-ON* */ static uword unformat_vlib_log_level (unformat_input_t * input, va_list * args) @@ -639,14 +611,12 @@ set_log_class (vlib_main_t * vm, return rv; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_set_log, static) = { .path = "set logging class", .short_help = "set logging class <class> [rate-limit <int>] " "[level <level>] [syslog-level <level>]", .function = set_log_class, }; -/* *INDENT-ON* */ static clib_error_t * set_log_unth_time (vlib_main_t * vm, @@ -673,13 +643,11 @@ set_log_unth_time (vlib_main_t * vm, return rv; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_set_log_params, static) = { .path = "set logging unthrottle-time", .short_help = "set logging unthrottle-time <int>", .function = set_log_unth_time, }; -/* *INDENT-ON* */ static clib_error_t * set_log_size (vlib_main_t * vm, @@ -709,13 +677,11 @@ set_log_size (vlib_main_t * vm, return rv; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_set_log_size, static) = { .path = "set logging size", .short_help = "set logging size <int>", .function = set_log_size, }; -/* *INDENT-ON* */ static uword unformat_vlib_log_subclass (unformat_input_t * input, va_list * args) @@ -788,13 +754,11 @@ test_log_class_subclass (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_test_log, static) = { .path = "test log", .short_help = "test log <level> <class> <subclass> <message>", .function = test_log_class_subclass, }; -/* *INDENT-ON* */ static clib_error_t * log_config_class (vlib_main_t * vm, char *name, unformat_input_t * input) |