[asterisk-commits] jrose: branch 1.8 r322069 - in /branches/1.8: include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon Jun  6 14:07:56 2011
New Revision: 322069

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322069
Log:
Fixes level toggling for logger set levels since it was reversed
 
(closes issue #17850)
Reported by: Luke H
Tested by: jrose, Luke H
  
Review: https://reviewboard.asterisk.org/r/1244/

Modified:
    branches/1.8/include/asterisk/logger.h
    branches/1.8/main/asterisk.c

Modified: branches/1.8/include/asterisk/logger.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/include/asterisk/logger.h?view=diff&rev=322069&r1=322068&r2=322069
==============================================================================
--- branches/1.8/include/asterisk/logger.h (original)
+++ branches/1.8/include/asterisk/logger.h Mon Jun  6 14:07:56 2011
@@ -98,7 +98,10 @@
 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);
 

Modified: branches/1.8/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/asterisk.c?view=diff&rev=322069&r1=322068&r2=322069
==============================================================================
--- branches/1.8/main/asterisk.c (original)
+++ branches/1.8/main/asterisk.c Mon Jun  6 14:07:56 2011
@@ -1082,12 +1082,19 @@
 	return res;
 }
 
+/*!
+ * \brief enable or disable a logging level to a specified console
+ */
 void ast_console_toggle_loglevel(int fd, int level, int state)
 {
 	int x;
 	for (x = 0;x < AST_MAX_CONNECTS; x++) {
 		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;
 		}
 	}