diff options
author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-11 19:41:43 +0000 |
---|---|---|
committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-11 19:41:43 +0000 |
commit | fe6d5fbd53db49a7b369a18f7ea845d5171376e6 (patch) | |
tree | 2dacab9045b8c5248ee67ebbe3af9f06f46ee85b /pbx | |
parent | b2ffa7cb77663d5e1f15149711a0765970ff3571 (diff) |
Merged revisions 262419 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r262419 | pabelanger | 2010-05-11 15:40:37 -0400 (Tue, 11 May 2010) | 8 lines
Improve logging by displaying line number
(closes issue #16303)
Reported by: dant
Patches:
issue16303.patch.v2 uploaded by pabelanger (license 224)
Tested by: dant, lmadsen, pabelanger
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@262420 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r-- | pbx/pbx_config.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 16e58cea5..66b29be83 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1433,7 +1433,7 @@ static int pbx_load_config(const char *config_file) if (!strncasecmp(v->name, "same", 4)) { if (ast_strlen_zero(lastextension)) { - ast_log(LOG_ERROR, "No previous pattern in the first entry of context '%s' to match '%s'!\n", cxt, v->name); + ast_log(LOG_ERROR, "No previous pattern in the first entry of context '%s' to match '%s' at line %d!\n", cxt, v->name, v->lineno); continue; } if ((stringp = tc = ast_strdup(v->value))) { @@ -1478,13 +1478,13 @@ process_extension: if (lastpri > -2) { ipri = lastpri + 1; } else { - ast_log(LOG_WARNING, "Can't use 'next' priority on the first entry!\n"); + ast_log(LOG_WARNING, "Can't use 'next' priority on the first entry at line %d!\n", v->lineno); } } else if (!strcmp(pri, "same") || !strcmp(pri, "s")) { if (lastpri > -2) { ipri = lastpri; } else { - ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry!\n"); + ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry at line %d!\n", v->lineno); } } else if (sscanf(pri, "%30d", &ipri) != 1 && (ipri = ast_findlabel_extension2(NULL, con, realext, pri, cidmatch)) < 1) { @@ -1516,7 +1516,7 @@ process_extension: if ((end = strrchr(data, ')'))) { *end = '\0'; } else { - ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data); + ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s' at line %d\n", appl, data, v->lineno); } } ast_free(orig_appl); @@ -1549,26 +1549,26 @@ process_extension: break; case EEXIST: - ast_log(LOG_WARNING, "Context '%s' already included in '%s' context\n", - v->value, cxt); + ast_log(LOG_WARNING, "Context '%s' already included in '%s' context on include at line %d\n", + v->value, cxt, v->lineno); break; case ENOENT: case EINVAL: - ast_log(LOG_WARNING, "There is no existence of context '%s'\n", - errno == ENOENT ? v->value : cxt); + ast_log(LOG_WARNING, "There is no existence of context '%s' included at line %d\n", + errno == ENOENT ? v->value : cxt, v->lineno); break; default: - ast_log(LOG_WARNING, "Failed to include '%s' in '%s' context\n", - v->value, cxt); + ast_log(LOG_WARNING, "Failed to include '%s' in '%s' context at line %d\n", + v->value, cxt, v->lineno); break; } } } else if (!strcasecmp(v->name, "ignorepat")) { pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1); if (ast_context_add_ignorepat2(con, realvalue, registrar)) { - ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s'\n", v->value, cxt); + ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s' at line %d\n", v->value, cxt, v->lineno); } } else if (!strcasecmp(v->name, "switch") || !strcasecmp(v->name, "lswitch") || !strcasecmp(v->name, "eswitch")) { char *stringp = realvalue; @@ -1582,7 +1582,7 @@ process_extension: appl = strsep(&stringp, "/"); data = S_OR(stringp, ""); if (ast_context_add_switch2(con, appl, data, !strcasecmp(v->name, "eswitch"), registrar)) { - ast_log(LOG_WARNING, "Unable to include switch '%s' in context '%s'\n", v->value, cxt); + ast_log(LOG_WARNING, "Unable to include switch '%s' in context '%s' at line %d\n", v->value, cxt, v->lineno); } } else { ast_log(LOG_WARNING, "==!!== Unknown directive: %s at line %d -- IGNORING!!!\n", v->name, v->lineno); |