<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/26174">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  osmith: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: don't mark reporter as 'disable' beforehand<br><br>Change-Id: I330a079807cca48b7cc43767abcd2b58830a05fc<br>Related: SYS#5713<br>---<br>M src/vty/stats_vty.c<br>M tests/stats/stats_vty_test.vty<br>2 files changed, 6 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c</span><br><span>index 48e4f1c..308bab6 100644</span><br><span>--- a/src/vty/stats_vty.c</span><br><span>+++ b/src/vty/stats_vty.c</span><br><span>@@ -638,8 +638,6 @@</span><br><span>           vty_out(vty, " %s", srep->name);</span><br><span>        vty_out(vty, "%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  vty_out(vty, "  disable%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>  if (srep->have_net_config) {</span><br><span>              if (srep->dest_addr_str)</span><br><span>                  vty_out(vty, "  remote-ip %s%s",</span><br><span>@@ -672,6 +670,8 @@</span><br><span> </span><br><span>         if (srep->enabled)</span><br><span>                vty_out(vty, "  enable%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+    else</span><br><span style="color: hsl(120, 100%, 40%);">+          vty_out(vty, "  disable%s", VTY_NEWLINE);</span><br><span> </span><br><span>      return 1;</span><br><span> }</span><br><span>diff --git a/tests/stats/stats_vty_test.vty b/tests/stats/stats_vty_test.vty</span><br><span>index 7c01d3f..ddfb3a6 100644</span><br><span>--- a/tests/stats/stats_vty_test.vty</span><br><span>+++ b/tests/stats/stats_vty_test.vty</span><br><span>@@ -36,9 +36,9 @@</span><br><span> ...</span><br><span> stats interval 5</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   level global</span><br><span>   no prefix</span><br><span style="color: hsl(120, 100%, 40%);">+  disable</span><br><span> ...</span><br><span> </span><br><span> stats_vty_test(config-stats)# level subscriber</span><br><span>@@ -46,7 +46,6 @@</span><br><span> stats_vty_test(config-stats)# show running-config</span><br><span> ...</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   level subscriber</span><br><span>   prefix statsd-prefix</span><br><span> ...</span><br><span>@@ -56,7 +55,6 @@</span><br><span> stats_vty_test(config-stats)# show running-config</span><br><span> ...</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   remote-ip 192.168.1.200</span><br><span>   remote-port 6969</span><br><span> ... !local-ip</span><br><span>@@ -65,7 +63,6 @@</span><br><span> stats_vty_test(config-stats)# show running-config</span><br><span> ...</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   remote-ip 192.168.1.200</span><br><span>   remote-port 6969</span><br><span>   local-ip 192.168.1.100</span><br><span>@@ -81,7 +78,6 @@</span><br><span> stats_vty_test(config-stats)# show running-config</span><br><span> ...</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   remote-ip 192.168.1.200</span><br><span>   remote-port 6969</span><br><span>   mtu 1337</span><br><span>@@ -97,7 +93,6 @@</span><br><span> stats_vty_test(config-stats)# show running-config</span><br><span> ...</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   remote-ip 192.168.1.200</span><br><span>   remote-port 6969</span><br><span>   level subscriber</span><br><span>@@ -116,7 +111,6 @@</span><br><span> stats_vty_test(config)# show running-config</span><br><span> ...</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   remote-ip 192.168.1.200</span><br><span>   remote-port 6969</span><br><span>   level subscriber</span><br><span>@@ -134,14 +128,12 @@</span><br><span> stats_vty_test(config)# show running-config</span><br><span> ...</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   remote-ip 192.168.1.200</span><br><span>   remote-port 6969</span><br><span>   level subscriber</span><br><span>   prefix statsd-prefix</span><br><span>   enable</span><br><span> stats reporter log</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   level peer</span><br><span>   prefix log-prefix</span><br><span>   enable</span><br><span>@@ -175,34 +167,32 @@</span><br><span> stats_vty_test(config)# show running-config</span><br><span> ...</span><br><span> stats reporter statsd</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   remote-ip 192.168.1.200</span><br><span>   remote-port 6969</span><br><span>   level subscriber</span><br><span>   prefix statsd-prefix</span><br><span>   enable</span><br><span> stats reporter log</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   level peer</span><br><span>   prefix log-prefix</span><br><span>   enable</span><br><span> stats reporter statsd statsd-foo</span><br><span style="color: hsl(0, 100%, 40%);">-  disable</span><br><span>   remote-ip 192.168.2.200</span><br><span>   remote-port 9696</span><br><span>   level global</span><br><span>   prefix statsd-one-prefix</span><br><span>   flush-period 1</span><br><span style="color: hsl(0, 100%, 40%);">-stats reporter log log-bar</span><br><span>   disable</span><br><span style="color: hsl(120, 100%, 40%);">+stats reporter log log-bar</span><br><span>   level global</span><br><span>   prefix log-bar-prefix</span><br><span>   flush-period 2</span><br><span style="color: hsl(0, 100%, 40%);">-stats reporter log log-zoo</span><br><span>   disable</span><br><span style="color: hsl(120, 100%, 40%);">+stats reporter log log-zoo</span><br><span>   level global</span><br><span>   prefix log-zoo-prefix</span><br><span>   flush-period 3</span><br><span style="color: hsl(120, 100%, 40%);">+  disable</span><br><span> ...</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/26174">change 26174</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/c/libosmocore/+/26174"/><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-Change-Id: I330a079807cca48b7cc43767abcd2b58830a05fc </div>
<div style="display:none"> Gerrit-Change-Number: 26174 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>