<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/16698">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make logging category DLMS generic and reusable for other backends<br><br>Make sure old configs using "logging level lms <level>" are still accepted.<br>Initialization order of VTY componenets need to be resorted since newly<br>introduced command requires logging VTY node to be already setup<br>beforehand.<br><br>Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e<br>---<br>M CommonLibs/debug.c<br>M CommonLibs/debug.h<br>M CommonLibs/trx_vty.c<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/osmo-trx.cpp<br>5 files changed, 20 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/98/16698/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c</span><br><span>index cc5be44..c227435 100644</span><br><span>--- a/CommonLibs/debug.c</span><br><span>+++ b/CommonLibs/debug.c</span><br><span>@@ -65,9 +65,9 @@</span><br><span> .color = NULL,</span><br><span> .enabled = 1, .loglevel = LOGL_INFO,</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- [DLMS] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DLMS",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "Logging from within LimeSuite itself",</span><br><span style="color: hsl(120, 100%, 40%);">+ [DDEVDRV] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DDEVDRV",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Logging from external device driver library implementing lower level specifics",</span><br><span> .color = NULL,</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span>diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h</span><br><span>index 3837329..0dca2ee 100644</span><br><span>--- a/CommonLibs/debug.h</span><br><span>+++ b/CommonLibs/debug.h</span><br><span>@@ -15,7 +15,7 @@</span><br><span> DTRXDDL,</span><br><span> DTRXDUL,</span><br><span> DDEV,</span><br><span style="color: hsl(0, 100%, 40%);">- DLMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ DDEVDRV,</span><br><span> };</span><br><span> </span><br><span> #define CLOGC(category, level, fmt, args...) do { \</span><br><span>diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c</span><br><span>index 02d6572..3519788 100644</span><br><span>--- a/CommonLibs/trx_vty.c</span><br><span>+++ b/CommonLibs/trx_vty.c</span><br><span>@@ -528,6 +528,18 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define OBSOLETE_MSG "Obsolete\n"</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(log_level_lms, log_level_lms_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "logging level lms (debug|info|notice|error|fatal)",</span><br><span style="color: hsl(120, 100%, 40%);">+ ".HIDDEN\n" OBSOLETE_MSG OBSOLETE_MSG OBSOLETE_MSG OBSOLETE_MSG</span><br><span style="color: hsl(120, 100%, 40%);">+ OBSOLETE_MSG OBSOLETE_MSG OBSOLETE_MSG OBSOLETE_MSG)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% 'logging level lms' is now called 'logging level devdrv'"</span><br><span style="color: hsl(120, 100%, 40%);">+ ", please update your config %s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</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> static int dummy_config_write(struct vty *v)</span><br><span> {</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -704,6 +716,8 @@</span><br><span> </span><br><span> install_element(CONFIG_NODE, &cfg_trx_cmd);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(CFG_LOG_NODE, &log_level_lms_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_node(&trx_node, config_write_trx);</span><br><span> install_element(TRX_NODE, &cfg_bind_ip_cmd);</span><br><span> install_element(TRX_NODE, &cfg_remote_ip_cmd);</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index b5993b8..19fe6e8 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -93,7 +93,7 @@</span><br><span> if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map))</span><br><span> lvl = ARRAY_SIZE(lvl_map)-1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGLV(DLMS, lvl_map[lvl]) << msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGLV(DDEVDRV, lvl_map[lvl]) << msg;</span><br><span> }</span><br><span> </span><br><span> static void print_range(const char* name, lms_range_t *range)</span><br><span>diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp</span><br><span>index 16047a9..0ad60ef 100644</span><br><span>--- a/Transceiver52M/osmo-trx.cpp</span><br><span>+++ b/Transceiver52M/osmo-trx.cpp</span><br><span>@@ -588,10 +588,10 @@</span><br><span> log_enable_multithread();</span><br><span> osmo_stats_init(tall_trx_ctx);</span><br><span> vty_init(&g_vty_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_cmds();</span><br><span> ctrl_vty_init(tall_trx_ctx);</span><br><span> trx_vty_init(g_trx_ctx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- logging_vty_add_cmds();</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> osmo_stats_vty_add_cmds();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/16698">change 16698</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/osmo-trx/+/16698"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e </div>
<div style="display:none"> Gerrit-Change-Number: 16698 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>