<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11086">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging_vty: Ensure writing well-formed config files<br><br>We want to have well-formed config files that print exactly one space<br>per VTY/config node level, and not two.<br><br>Change-Id: Ia75c7067284ea225cffe13ca71bad05a7747ae66<br>---<br>M src/vty/logging_vty.c<br>M tests/logging/logging_vty_test.vty<br>2 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c</span><br><span>index b2637a5..31edb52 100644</span><br><span>--- a/src/vty/logging_vty.c</span><br><span>+++ b/src/vty/logging_vty.c</span><br><span>@@ -890,24 +890,24 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging filter all %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging filter all %u%s",</span><br><span> tgt->filter_map & (1 << LOG_FLT_ALL) ? 1 : 0, VTY_NEWLINE);</span><br><span> /* save filters outside of libosmocore, i.e. in app code */</span><br><span> if (osmo_log_info->save_fn)</span><br><span> osmo_log_info->save_fn(vty, osmo_log_info, tgt);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging color %u%s", tgt->use_color ? 1 : 0,</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging print category %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging print category %d%s",</span><br><span> tgt->print_category ? 1 : 0, VTY_NEWLINE);</span><br><span> if (tgt->print_ext_timestamp)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging timestamp %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging timestamp %u%s",</span><br><span> tgt->print_timestamp ? 1 : 0, VTY_NEWLINE);</span><br><span> if (tgt->print_level)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging print level 1%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging print file %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging print level 1%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging print file %s%s",</span><br><span> get_value_string(logging_print_file_args, tgt->print_filename2),</span><br><span> VTY_NEWLINE);</span><br><span> </span><br><span>@@ -918,7 +918,7 @@</span><br><span> vty_out(vty, "%% Invalid log level %u for 'force-all'%s",</span><br><span> tgt->loglevel, VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> for (i = 0; i < osmo_log_info->num_cat; i++) {</span><br><span>@@ -941,7 +941,7 @@</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging level %s", cat_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging level %s", cat_name);</span><br><span> vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty</span><br><span>index 0c552a5..0eedbe3 100644</span><br><span>--- a/tests/logging/logging_vty_test.vty</span><br><span>+++ b/tests/logging/logging_vty_test.vty</span><br><span>@@ -4,11 +4,11 @@</span><br><span> ...</span><br><span> log stderr</span><br><span> ... !logging level all</span><br><span style="color: hsl(0, 100%, 40%);">- logging level aa debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging level bb info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level ccc notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level dddd error</span><br><span style="color: hsl(0, 100%, 40%);">- logging level eee fatal</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level aa debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level bb info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ccc notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level dddd error</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level eee fatal</span><br><span> ...</span><br><span> </span><br><span> logging_vty_test# configure terminal</span><br><span>@@ -17,7 +17,7 @@</span><br><span> logging_vty_test(config-log)# logging level force-all notice</span><br><span> logging_vty_test(config-log)# show running-config</span><br><span> ... !logging level all</span><br><span style="color: hsl(0, 100%, 40%);">- logging level force-all notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level force-all notice</span><br><span> ... !logging level all</span><br><span> </span><br><span> logging_vty_test(config-log)# no logging level force-all</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11086">change 11086</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/11086"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia75c7067284ea225cffe13ca71bad05a7747ae66 </div>
<div style="display:none"> Gerrit-Change-Number: 11086 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>