[svn-commits] kharwell: trunk r401836 - in /trunk: ./ main/logger.c

[SVN commits to the Digium repositories]

Author: kharwell
Date: Thu Oct 24 16:06:14 2013
New Revision: 401836

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401836
Log:
Logging: Logging types ignored after specifying a verbose level

If one specified a verbose level within a logging facility in
logger.conf then any component after it was ignored.  Fixed so
all values are correctly read.

(closes issue ASTERISK-22456)
Reported by: Kevin Harwell
........

Merged revisions 401833 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 401835 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/logger.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/logger.c?view=diff&rev=401836&r1=401835&r2=401836
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Thu Oct 24 16:06:14 2013
@@ -257,7 +257,6 @@
 			break;
 		} else if (!strncasecmp(w, "verbose(", 8) && sscanf(w + 8, "%d)", verbosity) == 1) {
 			res |= (1 << __LOG_VERBOSE);
-			break;
 		} else for (x = 0; x < ARRAY_LEN(levels); x++) {
 			if (levels[x] && !strcasecmp(w, levels[x])) {
 				res |= (1 << x);