Logging: Logging types ignored after specifying a verbose level
authorKevin Harwell <kharwell@digium.com>
Thu, 24 Oct 2013 21:06:14 +0000 (21:06 +0000)
committerKevin Harwell <kharwell@digium.com>
Thu, 24 Oct 2013 21:06:14 +0000 (21:06 +0000)
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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401836 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/logger.c

index a6b25cd..c551a4c 100644 (file)
@@ -257,7 +257,6 @@ static unsigned int make_components(const char *s, int lineno, int *verbosity)
                        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);