<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9753">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rate_ctr: Improve logging<br><br>Previous logic regarding logging of verification and mangling of<br>rate_ctr groups made it difficult to debug when an issue occurrs.<br><br>Change-Id: I992d165cab5ee6ca9b5b7e4a2210a0951954bd34<br>---<br>M src/rate_ctr.c<br>1 file changed, 20 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/9753/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/rate_ctr.c b/src/rate_ctr.c</span><br><span>index 777a42a..75302da 100644</span><br><span>--- a/src/rate_ctr.c</span><br><span>+++ b/src/rate_ctr.c</span><br><span>@@ -73,7 +73,7 @@</span><br><span> static void *tall_rate_ctr_ctx;</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static bool rate_ctrl_group_desc_validate(const struct rate_ctr_group_desc *desc, bool quiet)</span><br><span style="color: hsl(120, 100%, 40%);">+static bool rate_ctrl_group_desc_validate(const struct rate_ctr_group_desc *desc)</span><br><span> {</span><br><span> unsigned int i;</span><br><span> const struct rate_ctr_desc *ctr_desc;</span><br><span>@@ -88,17 +88,15 @@</span><br><span> desc->group_name_prefix, desc->num_ctr);</span><br><span> </span><br><span> if (!osmo_identifier_valid(desc->group_name_prefix)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!quiet)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_ERROR, "'%s' is not a valid counter group identifier\n",</span><br><span style="color: hsl(0, 100%, 40%);">- desc->group_name_prefix);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "'%s' is not a valid counter group identifier\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ desc->group_name_prefix);</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span> for (i = 0; i < desc->num_ctr; i++) {</span><br><span> if (!osmo_identifier_valid(ctr_desc[i].name)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!quiet)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_ERROR, "'%s' is not a valid counter identifier\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ctr_desc[i].name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "'%s' is not a valid counter identifier\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ctr_desc[i].name);</span><br><span> return false;</span><br><span> }</span><br><span> }</span><br><span>@@ -106,12 +104,13 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* return 'in' if it doesn't contaon any '.'; otherwise allocate a copy and</span><br><span style="color: hsl(120, 100%, 40%);">+/* return 'in' if it doesn't contain any '.'; otherwise allocate a copy and</span><br><span> * replace all '.' with ':' */</span><br><span> static char *mangle_identifier_ifneeded(const void *ctx, const char *in)</span><br><span> {</span><br><span> char *out;</span><br><span> unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool modified = false;</span><br><span> </span><br><span> if (!in)</span><br><span> return NULL;</span><br><span>@@ -123,10 +122,16 @@</span><br><span> OSMO_ASSERT(out);</span><br><span> </span><br><span> for (i = 0; i < strlen(out); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (out[i] == '.')</span><br><span style="color: hsl(120, 100%, 40%);">+ if (out[i] == '.') {</span><br><span> out[i] = ':';</span><br><span style="color: hsl(120, 100%, 40%);">+ modified = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (modified)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_NOTICE, "counter group name mangled: '%s' -> '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ in, out);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return out;</span><br><span> }</span><br><span> </span><br><span>@@ -139,6 +144,10 @@</span><br><span> </span><br><span> OSMO_ASSERT(desc_new);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_INFO, "Needed to mangle counter group '%s' names: it is still using '.' as "</span><br><span style="color: hsl(120, 100%, 40%);">+ "separator, which is not allowed. please consider updating the application\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ desc->group_name_prefix);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* mangle the name_prefix but copy/keep the rest */</span><br><span> desc_new->group_name_prefix = mangle_identifier_ifneeded(desc_new, desc->group_name_prefix);</span><br><span> desc_new->group_description = desc->group_description;</span><br><span>@@ -161,7 +170,7 @@</span><br><span> ctrd_new[i].description = ctrd[i].description;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!rate_ctrl_group_desc_validate(desc_new, false)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!rate_ctrl_group_desc_validate(desc_new)) {</span><br><span> /* simple mangling of identifiers ('.' -> ':') was not sufficient to render a valid</span><br><span> * descriptor, we have to bail out */</span><br><span> LOGP(DLGLOBAL, LOGL_ERROR, "counter group '%s' still invalid after mangling\n",</span><br><span>@@ -169,10 +178,6 @@</span><br><span> goto err_free;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLGLOBAL, LOGL_INFO, "Needed to mangle counter group '%s' names: it is still using '.' as "</span><br><span style="color: hsl(0, 100%, 40%);">- "separator, which is not allowed. please consider updating the application\n",</span><br><span style="color: hsl(0, 100%, 40%);">- desc->group_name_prefix);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return desc_new;</span><br><span> err_free:</span><br><span> talloc_free(desc_new);</span><br><span>@@ -231,7 +236,7 @@</span><br><span> return NULL;</span><br><span> </span><br><span> /* attempt to mangle all '.' in identifiers to ':' for backwards compat */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!rate_ctrl_group_desc_validate(desc, true)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!rate_ctrl_group_desc_validate(desc)) {</span><br><span> desc = rate_ctr_group_desc_mangle(group, desc);</span><br><span> if (!desc) {</span><br><span> talloc_free(group);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9753">change 9753</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/9753"/><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: I992d165cab5ee6ca9b5b7e4a2210a0951954bd34 </div>
<div style="display:none"> Gerrit-Change-Number: 9753 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>