diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2017-01-20 21:13:34 -0600 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2017-01-24 11:25:19 -0600 |
| commit | 6f3e8c8e01e9b7fc91dea660769ff1f11f32e629 (patch) | |
| tree | 61f26e4299d95cd4ba34c911264f22d7c965bb1e /main/asterisk.c | |
| parent | a5d87617213ee1a8eeaa4f2a7b96318a1cdfd217 (diff) | |
PJPROJECT logging: Fix detection of max supported log level.
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
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 338c1f53b..69183c1f3 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -330,6 +330,7 @@ int ast_verb_sys_level; int option_verbose; /*!< Verbosity level */ int option_debug; /*!< Debug level */ +int ast_pjproject_max_log_level = -1;/* Default to -1 to know if we have read the level from pjproject yet. */ int ast_option_pjproject_log_level; double ast_option_maxload; /*!< Max load avg on system */ int ast_option_maxcalls; /*!< Max number of active calls */ |