[asterisk-commits] kharwell: branch 12 r401835 - in /branches/12: ./ main/logger.c

[SVN commits to the Asterisk project]

Author: kharwell
Date: Thu Oct 24 15:56:50 2013
New Revision: 401835

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401835
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

Modified:
    branches/12/   (props changed)
    branches/12/main/logger.c

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

Modified: branches/12/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/logger.c?view=diff&rev=401835&r1=401834&r2=401835
==============================================================================
--- branches/12/main/logger.c (original)
+++ branches/12/main/logger.c Thu Oct 24 15:56:50 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);