kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

PJPROJECT logging: Fix detection of max supported log level.

Browse Source 
The mechanism used for detecting the maximum log level compiled into the
linked pjproject did not work.  The API call simply stores the requested
level into an integer and does no range checking.  Asterisk was assuming
that there was range checking and limited the new value to the allowable
range.  To get the actual maximum log level compiled into the linked
pjproject we need to get and save off the initial set log level from
pjproject.  This is the maximum log level supported.

* Get and save off the initial log level setting before altering it to the
desired level on startup.  This has to be done by a macro rather than
calling a core function to avoid incorrectly linking pjproject.

* Split the initial log level warning messages to warn if the linked
pjproject cannot support the requested startup level and if it is too low
to get the pjproject buildopts for "pjproject show buildopts".

* Adjust the CLI "pjproject set log level" to check the saved max log
level and to generate normal output messages instead of a warning message.

ASTERISK-26743 #close

Change-Id: I40aa76653e2a1dece66c3f8734594b4f0471cfb4
This commit is contained in:
Richard Mudgett
2017-01-20 21:13:34 -06:00
parent a5d8761721
commit 6f3e8c8e01
5 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/res_pjproject.c
View File

@@ -410,18 +410,22 @@ static char *handle_pjproject_set_log_level(struct ast_cli_entry *e, int cmd, st
}
/* Update pjproject logging level */
if (ast_pjproject_max_log_level < level_new) {
level_new = ast_pjproject_max_log_level;
ast_cli(a->fd,
"Asterisk built or linked with pjproject PJ_LOG_MAX_LEVEL=%d.\n"
"Lowering request to the max supported level.\n",
ast_pjproject_max_log_level);
}
level_old = ast_option_pjproject_log_level;
if (level_old == level_new) {
ast_cli(a->fd, "pjproject log level is still %d.\n", level_old);
} else {
ast_cli(a->fd, "pjproject log level was %d and is now %d.\n",
level_old, level_new);
ast_option_pjproject_log_level = level_new;
pj_log_set_level(level_new);
}
ast_option_pjproject_log_level = pj_log_get_level();
if (ast_option_pjproject_log_level != level_new) {
ast_log(LOG_WARNING, "Asterisk built with pjproject PJ_LOG_MAX_LEVEL set too low.\n");
}
return CLI_SUCCESS;
}
@@ -495,7 +499,7 @@ static int load_module(void)
ast_sorcery_load(pjproject_sorcery);
pj_log_set_level(ast_option_pjproject_log_level);
AST_PJPROJECT_INIT_LOG_LEVEL();
pj_init();
decor_orig = pj_log_get_decor();
@@ -512,12 +516,19 @@ static int load_module(void)
pj_log_set_decor(0);
pj_log_set_level(MAX_PJ_LOG_MAX_LEVEL);/* Set level to guarantee the dump output. */
pj_dump_config();
pj_log_set_level(ast_option_pjproject_log_level);
pj_log_set_decor(PJ_LOG_HAS_SENDER | PJ_LOG_HAS_INDENT);
pj_log_set_log_func(log_forwarder);
if (!AST_VECTOR_SIZE(&buildopts)
|| ast_option_pjproject_log_level != pj_log_get_level()) {
ast_log(LOG_WARNING, "Asterisk built or linked with pjproject PJ_LOG_MAX_LEVEL set too low.\n");
if (ast_pjproject_max_log_level < ast_option_pjproject_log_level) {
ast_log(LOG_WARNING,
"Asterisk built or linked with pjproject PJ_LOG_MAX_LEVEL=%d which is too low for startup level: %d.\n",
ast_pjproject_max_log_level, ast_option_pjproject_log_level);
ast_option_pjproject_log_level = ast_pjproject_max_log_level;
}
pj_log_set_level(ast_option_pjproject_log_level);
if (!AST_VECTOR_SIZE(&buildopts)) {
ast_log(LOG_NOTICE,
"Asterisk built or linked with pjproject PJ_LOG_MAX_LEVEL=%d which is too low to get buildopts.\n",
ast_pjproject_max_log_level);
}
ast_cli_register_multiple(pjproject_cli, ARRAY_LEN(pjproject_cli));