mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-11 20:38:45 +00:00
Merged revisions 322069 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r322069 | jrose | 2011-06-06 14:07:56 -0500 (Mon, 06 Jun 2011) | 8 lines Fixes level toggling for logger set levels since it was reversed (closes issue ASTERISK-17850) Reported by: Luke H Tested by: jrose, Luke H Review: https://reviewboard.asterisk.org/r/1244/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@322070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -98,7 +98,10 @@ void ast_console_puts_mutable(const char *string, int level);
|
|||||||
void ast_console_toggle_mute(int fd, int silent);
|
void ast_console_toggle_mute(int fd, int silent);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \since 1.6.1
|
* \brief enables or disables logging of a specified level to the console
|
||||||
|
* fd specifies the index of the console receiving the level change
|
||||||
|
* level specifies the index of the logging level being toggled
|
||||||
|
* state indicates whether logging will be on or off (0 for off, 1 for on)
|
||||||
*/
|
*/
|
||||||
void ast_console_toggle_loglevel(int fd, int level, int state);
|
void ast_console_toggle_loglevel(int fd, int level, int state);
|
||||||
|
|
||||||
|
|||||||
@@ -1087,12 +1087,19 @@ int ast_safe_system(const char *s)
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief enable or disable a logging level to a specified console
|
||||||
|
*/
|
||||||
void ast_console_toggle_loglevel(int fd, int level, int state)
|
void ast_console_toggle_loglevel(int fd, int level, int state)
|
||||||
{
|
{
|
||||||
int x;
|
int x;
|
||||||
for (x = 0;x < AST_MAX_CONNECTS; x++) {
|
for (x = 0;x < AST_MAX_CONNECTS; x++) {
|
||||||
if (fd == consoles[x].fd) {
|
if (fd == consoles[x].fd) {
|
||||||
consoles[x].levels[level] = state;
|
/*
|
||||||
|
* Since the logging occurs when levels are false, set to
|
||||||
|
* flipped iinput because this function accepts 0 as off and 1 as on
|
||||||
|
*/
|
||||||
|
consoles[x].levels[level] = state ? 0 : 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user