<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10885">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging vty: deprecate the 'everything' keyword<br><br>The 'logging level all everything' has not had an effect for some time now. The<br>plan is to bring back its old functionality, but to keep it deprecated and<br>rather define a less confusing name.<br><br>* Deprecate 'everything'.<br>* Do not write 'everything' during 'write file' or 'show running-config', which<br> we curiously still do until now.<br><br>BTW, the reason why we need to compose a complete list of categories for the<br>deprecated 'everything' command is explained in detail in the commit log for<br>I3b083f27e3d751ccec258880ae7676e9af959a63<br><br>Change-Id: Ib75fedb0572570a61bb34ee729a2af86cf5f16da<br>---<br>M src/logging.c<br>M src/vty/logging_vty.c<br>M tests/logging/logging_vty_test.vty<br>3 files changed, 35 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10885/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index 7c2d61f..67470a5 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -64,7 +64,6 @@</span><br><span> LLIST_HEAD(osmo_log_target_list);</span><br><span> </span><br><span> static const struct value_string loglevel_strs[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, "EVERYTHING" },</span><br><span> { LOGL_DEBUG, "DEBUG" },</span><br><span> { LOGL_INFO, "INFO" },</span><br><span> { LOGL_NOTICE, "NOTICE" },</span><br><span>diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c</span><br><span>index 2b001bc..6758dd2 100644</span><br><span>--- a/src/vty/logging_vty.c</span><br><span>+++ b/src/vty/logging_vty.c</span><br><span>@@ -320,7 +320,7 @@</span><br><span> cmd->doc = doc_str;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* logging level (all|<categories>) (everything|debug|...|fatal) */</span><br><span style="color: hsl(120, 100%, 40%);">+/* logging level (all|<categories>) (debug|...|fatal) */</span><br><span> DEFUN(logging_level,</span><br><span> logging_level_cmd,</span><br><span> NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */</span><br><span>@@ -338,11 +338,6 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (strcmp(argv[1], "everything") == 0) { /* FIXME: remove this check once 'everything' is phased out */</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Ignoring deprecated logging level %s%s", argv[1], VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Check for special case where we want to set global log level */</span><br><span> if (!strcmp(argv[0], "all")) {</span><br><span> log_set_log_level(tgt, level);</span><br><span>@@ -360,6 +355,15 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* logging level (all|<categories>) everything */</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(deprecated_logging_level_everything, deprecated_logging_level_everything_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL, /* cmdstr is dynamically set in logging_vty_add_cmds(). */</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL) /* same thing for helpstr. */</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Ignoring deprecated logging level 'everything' keyword%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(logging_set_category_mask,</span><br><span> logging_set_category_mask_cmd,</span><br><span> "logging set-log-mask MASK",</span><br><span>@@ -858,8 +862,9 @@</span><br><span> VTY_NEWLINE);</span><br><span> </span><br><span> /* stupid old osmo logging API uses uppercase strings... */</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)),</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tgt->loglevel)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> </span><br><span> for (i = 0; i < osmo_log_info->num_cat; i++) {</span><br><span> const struct log_category *cat = &tgt->categories[i];</span><br><span>@@ -896,7 +901,7 @@</span><br><span> {</span><br><span> struct cmd_element *cmd = talloc_zero(ctx, struct cmd_element);</span><br><span> OSMO_ASSERT(cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- cmd->string = talloc_asprintf(cmd, "logging level %s (everything|debug|info|notice|error|fatal)",</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->string = talloc_asprintf(cmd, "logging level %s (debug|info|notice|error|fatal)",</span><br><span> name);</span><br><span> printf("%s\n", cmd->string);</span><br><span> cmd->func = log_deprecated_func;</span><br><span>@@ -924,12 +929,16 @@</span><br><span> install_element_ve(&logging_set_category_mask_cmd);</span><br><span> install_element_ve(&logging_set_category_mask_old_cmd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* logging level (all|<categories>) (everything|debug|...|fatal) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* logging level (all|<categories>) (debug|...|fatal) */</span><br><span> gen_logging_level_cmd_strs(&logging_level_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "(everything|" LOG_LEVEL_ARGS ")",</span><br><span style="color: hsl(0, 100%, 40%);">- EVERYTHING_STR LOG_LEVEL_STRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ "(" LOG_LEVEL_ARGS ")",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LEVEL_STRS);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* logging level (all|<categories>) everything */</span><br><span style="color: hsl(120, 100%, 40%);">+ gen_logging_level_cmd_strs(&deprecated_logging_level_everything_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "everything", EVERYTHING_STR);</span><br><span> </span><br><span> install_element_ve(&logging_level_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&deprecated_logging_level_everything_cmd);</span><br><span> install_element_ve(&show_logging_vty_cmd);</span><br><span> install_element_ve(&show_alarms_cmd);</span><br><span> </span><br><span>@@ -943,6 +952,7 @@</span><br><span> install_element(CFG_LOG_NODE, &logging_prnt_level_cmd);</span><br><span> install_element(CFG_LOG_NODE, &logging_prnt_file_cmd);</span><br><span> install_element(CFG_LOG_NODE, &logging_level_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd);</span><br><span> </span><br><span> install_element(CONFIG_NODE, &cfg_log_stderr_cmd);</span><br><span> install_element(CONFIG_NODE, &cfg_no_log_stderr_cmd);</span><br><span>diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty</span><br><span>index c57b70f..a2c1e74 100644</span><br><span>--- a/tests/logging/logging_vty_test.vty</span><br><span>+++ b/tests/logging/logging_vty_test.vty</span><br><span>@@ -1,11 +1,9 @@</span><br><span> logging_vty_test> enable</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-logging_vty_test# ! Note that 'logging level all everything' is still printed!</span><br><span> logging_vty_test# show running-config</span><br><span> ...</span><br><span> log stderr</span><br><span style="color: hsl(0, 100%, 40%);">-...</span><br><span style="color: hsl(0, 100%, 40%);">- logging level all everything</span><br><span style="color: hsl(120, 100%, 40%);">+... !logging level all</span><br><span> logging level aa debug</span><br><span> logging level bb info</span><br><span> logging level ccc notice</span><br><span>@@ -39,7 +37,7 @@</span><br><span> logging print level (0|1)</span><br><span> logging print file (0|1|basename) [last]</span><br><span> logging set-log-mask MASK</span><br><span style="color: hsl(0, 100%, 40%);">- logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (everything|debug|info|notice|error|fatal)</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal)</span><br><span> show logging vty</span><br><span> ... !logging</span><br><span> </span><br><span>@@ -64,20 +62,18 @@</span><br><span> ...</span><br><span> </span><br><span> logging_vty_test# logging level aa ?</span><br><span style="color: hsl(0, 100%, 40%);">- everything Don't use. It doesn't log anything</span><br><span style="color: hsl(0, 100%, 40%);">- debug Log debug messages and higher levels</span><br><span style="color: hsl(0, 100%, 40%);">- info Log informational messages and higher levels</span><br><span style="color: hsl(0, 100%, 40%);">- notice Log noticeable messages and higher levels</span><br><span style="color: hsl(0, 100%, 40%);">- error Log error messages and higher levels</span><br><span style="color: hsl(0, 100%, 40%);">- fatal Log only fatal messages</span><br><span style="color: hsl(120, 100%, 40%);">+ debug Log debug messages and higher levels</span><br><span style="color: hsl(120, 100%, 40%);">+ info Log informational messages and higher levels</span><br><span style="color: hsl(120, 100%, 40%);">+ notice Log noticeable messages and higher levels</span><br><span style="color: hsl(120, 100%, 40%);">+ error Log error messages and higher levels</span><br><span style="color: hsl(120, 100%, 40%);">+ fatal Log only fatal messages</span><br><span> </span><br><span> logging_vty_test# logging level all ?</span><br><span style="color: hsl(0, 100%, 40%);">- everything Don't use. It doesn't log anything</span><br><span style="color: hsl(0, 100%, 40%);">- debug Log debug messages and higher levels</span><br><span style="color: hsl(0, 100%, 40%);">- info Log informational messages and higher levels</span><br><span style="color: hsl(0, 100%, 40%);">- notice Log noticeable messages and higher levels</span><br><span style="color: hsl(0, 100%, 40%);">- error Log error messages and higher levels</span><br><span style="color: hsl(0, 100%, 40%);">- fatal Log only fatal messages</span><br><span style="color: hsl(120, 100%, 40%);">+ debug Log debug messages and higher levels</span><br><span style="color: hsl(120, 100%, 40%);">+ info Log informational messages and higher levels</span><br><span style="color: hsl(120, 100%, 40%);">+ notice Log noticeable messages and higher levels</span><br><span style="color: hsl(120, 100%, 40%);">+ error Log error messages and higher levels</span><br><span style="color: hsl(120, 100%, 40%);">+ fatal Log only fatal messages</span><br><span> </span><br><span> </span><br><span> logging_vty_test# log-sweep</span><br><span>@@ -181,7 +177,7 @@</span><br><span> </span><br><span> logging_vty_test# ! Old 'logging level all everything' has no effect</span><br><span> logging_vty_test# logging level all everything</span><br><span style="color: hsl(0, 100%, 40%);">-% Ignoring deprecated logging level everything</span><br><span style="color: hsl(120, 100%, 40%);">+% Ignoring deprecated logging level 'everything' keyword</span><br><span> logging_vty_test# log-sweep eee</span><br><span> DEEE NOTICE Log message for DEEE on level LOGL_NOTICE</span><br><span> DEEE ERROR Log message for DEEE on level LOGL_ERROR</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10885">change 10885</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10885"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib75fedb0572570a61bb34ee729a2af86cf5f16da </div>
<div style="display:none"> Gerrit-Change-Number: 10885 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>