<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10136">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: Add VTY cmd: logging level unset <loglevel><br><br>This command is useful while debugging an osmocom application in the<br>VTY. It allows a user to keep per-category set loglevels while changing<br>the default log level.<br><br>For instance, scenario:<br>1- Set everything to error to get as low output as possible (but keep<br>seeing errors):<br>logging level all error<br>2- Set severla categories to debug:<br>logging level trx debug<br>logging level l1c info<br>logging level l1p info<br>3- Decide more output is required while keeping setup for previously set<br>categories:<br>logging level unset notice<br><br>As a result, we have trx=debug, l1c=info, l1p=info and all the other<br>categories are handled as loglvel notice.<br><br>Change-Id: Iee0d4da16b075e798f85c3f6adeb513057fd5402<br>---<br>M include/osmocom/core/logging.h<br>M src/logging.c<br>M src/vty/logging_vty.c<br>3 files changed, 33 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/10136/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h</span><br><span>index 5d4fd36..bc6174d 100644</span><br><span>--- a/include/osmocom/core/logging.h</span><br><span>+++ b/include/osmocom/core/logging.h</span><br><span>@@ -340,6 +340,7 @@</span><br><span> void log_set_print_category_hex(struct log_target *target, int);</span><br><span> void log_set_print_level(struct log_target *target, int);</span><br><span> void log_set_log_level(struct log_target *target, int log_level);</span><br><span style="color: hsl(120, 100%, 40%);">+void log_set_log_level_unset(struct log_target *target, int log_level);</span><br><span> void log_parse_category_mask(struct log_target *target, const char* mask);</span><br><span> const char* log_category_name(int subsys);</span><br><span> int log_parse_level(const char *lvl) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE;</span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index b0ac0b5..ebd6838 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -710,6 +710,16 @@</span><br><span> target->print_level = (bool)print_level;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Set the global log level for a given log target. This log level will be used</span><br><span style="color: hsl(120, 100%, 40%);">+ * as a default for all log categories with an unset level.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] target Log target to be affected</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] log_level New global log level</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void log_set_log_level_unset(struct log_target *target, int log_level)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ target->loglevel = log_level;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Set the global log level for a given log target. Unsets previously set</span><br><span> * category specific log levels.</span><br><span> * \param[in] target Log target to be affected</span><br><span>@@ -948,7 +958,7 @@</span><br><span> {</span><br><span> struct log_info *info = osmo_log_info;</span><br><span> int len = 0, offset = 0, ret, i, rem;</span><br><span style="color: hsl(0, 100%, 40%);">- int size = strlen("logging level (all|) ()") + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int size = strlen("logging level (all|unset|) ()") + 1;</span><br><span> char *str;</span><br><span> </span><br><span> assert_loginfo(__func__);</span><br><span>@@ -967,7 +977,7 @@</span><br><span> if (!str)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ret = snprintf(str + offset, rem, "logging level (all|");</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = snprintf(str + offset, rem, "logging level (all|unset|");</span><br><span> if (ret < 0)</span><br><span> goto err;</span><br><span> OSMO_SNPRINTF_RET(ret, rem, offset, len);</span><br><span>@@ -1029,6 +1039,11 @@</span><br><span> struct log_info *info = osmo_log_info;</span><br><span> char *str;</span><br><span> int i, ret, len = 0, offset = 0, rem;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *static_categories[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "Global setting for all subsystems (unsets previosuly set subsystems)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Global setting for all subsystems with unset log level\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> unsigned int size =</span><br><span> strlen(LOGGING_STR</span><br><span> "Set the log level for a specified category\n") + 1;</span><br><span>@@ -1044,7 +1059,8 @@</span><br><span> for (i = 0; i < LOGLEVEL_DEFS; i++)</span><br><span> size += strlen(loglevel_descriptions[i]) + 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- size += strlen("Global setting for all subsystems") + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; static_categories[i] != NULL; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ size += strlen(static_categories[i]) + 1;</span><br><span> rem = size;</span><br><span> str = talloc_zero_size(tall_log_ctx, size);</span><br><span> if (!str)</span><br><span>@@ -1056,11 +1072,12 @@</span><br><span> goto err;</span><br><span> OSMO_SNPRINTF_RET(ret, rem, offset, len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ret = snprintf(str + offset, rem,</span><br><span style="color: hsl(0, 100%, 40%);">- "Global setting for all subsystems\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_SNPRINTF_RET(ret, rem, offset, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; static_categories[i] != NULL; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = snprintf(str + offset, rem, static_categories[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SNPRINTF_RET(ret, rem, offset, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> for (i = 0; i < info->num_cat; i++) {</span><br><span> if (info->cat[i].name == NULL)</span><br><span>diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c</span><br><span>index 735d348..2373a6b 100644</span><br><span>--- a/src/vty/logging_vty.c</span><br><span>+++ b/src/vty/logging_vty.c</span><br><span>@@ -284,12 +284,18 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Check for special case where we want to set global log level */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check for special case where we want to set global log level and unset all categories */</span><br><span> if (!strcmp(argv[0], "all")) {</span><br><span> log_set_log_level(tgt, level);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check for special case where we want to set global log level without unsetting categories */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "unset")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_log_level_unset(tgt, level);</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> if (category < 0) {</span><br><span> vty_out(vty, "Invalid category `%s'%s", argv[0], VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10136">change 10136</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/10136"/><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: Iee0d4da16b075e798f85c3f6adeb513057fd5402 </div>
<div style="display:none"> Gerrit-Change-Number: 10136 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>