Make logging category DLMS generic and reusable for other backends
Make sure old configs using "logging level lms <level>" are still accepted. Initialization order of VTY componenets need to be resorted since newly introduced command requires logging VTY node to be already setup beforehand. Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e
This commit is contained in:
parent
da7fee8ea8
commit
aebbfe0ee7
|
@ -65,9 +65,9 @@ static const struct log_info_cat default_categories[] = {
|
|||
.color = NULL,
|
||||
.enabled = 1, .loglevel = LOGL_INFO,
|
||||
},
|
||||
[DLMS] = {
|
||||
.name = "DLMS",
|
||||
.description = "Logging from within LimeSuite itself",
|
||||
[DDEVDRV] = {
|
||||
.name = "DDEVDRV",
|
||||
.description = "Logging from external device driver library implementing lower level specifics",
|
||||
.color = NULL,
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
|
|
|
@ -15,7 +15,7 @@ enum {
|
|||
DTRXDDL,
|
||||
DTRXDUL,
|
||||
DDEV,
|
||||
DLMS,
|
||||
DDEVDRV,
|
||||
};
|
||||
|
||||
#define CLOGC(category, level, fmt, args...) do { \
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include <osmocom/core/rate_ctr.h>
|
||||
|
||||
#include <osmocom/vty/command.h>
|
||||
#include <osmocom/vty/logging.h>
|
||||
#include <osmocom/vty/vty.h>
|
||||
#include <osmocom/vty/misc.h>
|
||||
|
||||
|
@ -731,5 +732,7 @@ int trx_vty_init(struct trx_ctx* trx)
|
|||
install_element(CHAN_NODE, &cfg_chan_rx_path_cmd);
|
||||
install_element(CHAN_NODE, &cfg_chan_tx_path_cmd);
|
||||
|
||||
logging_vty_add_deprecated_subsys(g_trx_ctx, "lms");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -93,7 +93,7 @@ static void lms_log_callback(int lvl, const char *msg)
|
|||
if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map))
|
||||
lvl = ARRAY_SIZE(lvl_map)-1;
|
||||
|
||||
LOGLV(DLMS, lvl_map[lvl]) << msg;
|
||||
LOGLV(DDEVDRV, lvl_map[lvl]) << msg;
|
||||
}
|
||||
|
||||
static void print_range(const char* name, lms_range_t *range)
|
||||
|
|
|
@ -588,10 +588,10 @@ int main(int argc, char *argv[])
|
|||
log_enable_multithread();
|
||||
osmo_stats_init(tall_trx_ctx);
|
||||
vty_init(&g_vty_info);
|
||||
logging_vty_add_cmds();
|
||||
ctrl_vty_init(tall_trx_ctx);
|
||||
trx_vty_init(g_trx_ctx);
|
||||
|
||||
logging_vty_add_cmds();
|
||||
osmo_talloc_vty_add_cmds();
|
||||
osmo_stats_vty_add_cmds();
|
||||
|
||||
|
|
Loading…
Reference in New Issue