lib: Separate out the debug_init api

Separate out the debug_init api to have 2 functions:

1) Function to register a callback
2) Function to initiate the cli.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-05-24 20:15:31 -04:00
parent f756a869ae
commit ae0994f6eb
4 changed files with 14 additions and 1 deletions

View File

@ -54,7 +54,10 @@ void debug_init(struct debug_callbacks *cb)
}
debug_cb_list_add_head(&cb_head, cb);
}
void debug_init_cli(void)
{
install_element(ENABLE_NODE, &debug_all_cmd);
install_element(CONFIG_NODE, &debug_all_cmd);
}

View File

@ -241,6 +241,12 @@ struct debug_callbacks {
*/
void debug_init(struct debug_callbacks *cb);
/*
* Turn on the cli to turn on/off debugs.
* Should only be called by libfrr
*/
void debug_init_cli(void);
#ifdef __cplusplus
}
#endif

View File

@ -39,6 +39,7 @@
#include "db.h"
#include "northbound_cli.h"
#include "northbound_db.h"
#include "debug.h"
DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm))
DEFINE_KOOH(frr_early_fini, (), ())
@ -654,6 +655,9 @@ struct thread_master *frr_init(void)
lib_error_init();
yang_init();
debug_init_cli();
nb_init(master, di->yang_modules, di->n_yang_modules);
if (nb_db_init() != NB_OK)
flog_warn(EC_LIB_NB_DATABASE,

View File

@ -1722,8 +1722,8 @@ void nb_cli_init(struct thread_master *tm)
/* Initialize the shared candidate configuration. */
vty_shared_candidate_config = nb_config_new(NULL);
/* Install debug commands */
debug_init(&nb_dbg_cbs);
install_node(&nb_debug_node, nb_debug_config_write);
install_element(ENABLE_NODE, &debug_nb_cmd);
install_element(CONFIG_NODE, &debug_nb_cmd);