Merge "pbx: Reduce verbosity while loading extensions"
This commit is contained in:
commit
fd32ca51e8
3 changed files with 12 additions and 13 deletions
6
CHANGES
6
CHANGES
|
@ -60,6 +60,12 @@ cdr_syslog
|
||||||
--- Functionality changes from Asterisk 15.2.0 to Asterisk 15.3.0 ------------
|
--- Functionality changes from Asterisk 15.2.0 to Asterisk 15.3.0 ------------
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Core
|
||||||
|
------------------
|
||||||
|
* During dialplan reload log messages are produced for each context,
|
||||||
|
extension and include. These messages are no longer printed by the
|
||||||
|
verbose loggers, they are now only logged as debug messages.
|
||||||
|
|
||||||
app_followme
|
app_followme
|
||||||
------------------
|
------------------
|
||||||
* Added a new prompt, connecting-prompt, which will be played
|
* Added a new prompt, connecting-prompt, which will be played
|
||||||
|
|
|
@ -2191,7 +2191,6 @@ static struct ast_config *config_text_file_load(const char *database, const char
|
||||||
/* If we get to this point, then we're loading regardless */
|
/* If we get to this point, then we're loading regardless */
|
||||||
ast_clear_flag(&flags, CONFIG_FLAG_FILEUNCHANGED);
|
ast_clear_flag(&flags, CONFIG_FLAG_FILEUNCHANGED);
|
||||||
ast_debug(1, "Parsing %s\n", fn);
|
ast_debug(1, "Parsing %s\n", fn);
|
||||||
ast_verb(2, "Parsing '%s': Found\n", fn);
|
|
||||||
while (!feof(f)) {
|
while (!feof(f)) {
|
||||||
lineno++;
|
lineno++;
|
||||||
if (fgets(buf, sizeof(buf), f)) {
|
if (fgets(buf, sizeof(buf), f)) {
|
||||||
|
|
18
main/pbx.c
18
main/pbx.c
|
@ -6207,15 +6207,14 @@ struct ast_context *ast_context_find_or_create(struct ast_context **extcontexts,
|
||||||
*local_contexts = tmp;
|
*local_contexts = tmp;
|
||||||
ast_hashtab_insert_safe(contexts_table, tmp); /*put this context into the tree */
|
ast_hashtab_insert_safe(contexts_table, tmp); /*put this context into the tree */
|
||||||
ast_unlock_contexts();
|
ast_unlock_contexts();
|
||||||
ast_verb(3, "Registered extension context '%s'; registrar: %s\n", tmp->name, registrar);
|
|
||||||
} else {
|
} else {
|
||||||
tmp->next = *local_contexts;
|
tmp->next = *local_contexts;
|
||||||
if (exttable)
|
if (exttable)
|
||||||
ast_hashtab_insert_immediate(exttable, tmp); /*put this context into the tree */
|
ast_hashtab_insert_immediate(exttable, tmp); /*put this context into the tree */
|
||||||
|
|
||||||
*local_contexts = tmp;
|
*local_contexts = tmp;
|
||||||
ast_verb(3, "Registered extension context '%s'; registrar: %s\n", tmp->name, registrar);
|
|
||||||
}
|
}
|
||||||
|
ast_debug(1, "Registered extension context '%s'; registrar: %s\n", tmp->name, registrar);
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6245,7 +6244,7 @@ static void context_merge_incls_swits_igps_other_registrars(struct ast_context *
|
||||||
{
|
{
|
||||||
int idx;
|
int idx;
|
||||||
|
|
||||||
ast_verb(3, "merging incls/swits/igpats from old(%s) to new(%s) context, registrar = %s\n", ast_get_context_name(old), ast_get_context_name(new), registrar);
|
ast_debug(1, "merging incls/swits/igpats from old(%s) to new(%s) context, registrar = %s\n", ast_get_context_name(old), ast_get_context_name(new), registrar);
|
||||||
/* copy in the includes, switches, and ignorepats */
|
/* copy in the includes, switches, and ignorepats */
|
||||||
/* walk through includes */
|
/* walk through includes */
|
||||||
for (idx = 0; idx < ast_context_includes_count(old); idx++) {
|
for (idx = 0; idx < ast_context_includes_count(old); idx++) {
|
||||||
|
@ -6430,6 +6429,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_
|
||||||
struct ast_state_cb *thiscb;
|
struct ast_state_cb *thiscb;
|
||||||
struct ast_hashtab_iter *iter;
|
struct ast_hashtab_iter *iter;
|
||||||
struct ao2_iterator i;
|
struct ao2_iterator i;
|
||||||
|
int ctx_count = 0;
|
||||||
struct timeval begintime;
|
struct timeval begintime;
|
||||||
struct timeval writelocktime;
|
struct timeval writelocktime;
|
||||||
struct timeval endlocktime;
|
struct timeval endlocktime;
|
||||||
|
@ -6465,6 +6465,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_
|
||||||
|
|
||||||
iter = ast_hashtab_start_traversal(contexts_table);
|
iter = ast_hashtab_start_traversal(contexts_table);
|
||||||
while ((tmp = ast_hashtab_next(iter))) {
|
while ((tmp = ast_hashtab_next(iter))) {
|
||||||
|
++ctx_count;
|
||||||
context_merge(extcontexts, exttable, tmp, registrar);
|
context_merge(extcontexts, exttable, tmp, registrar);
|
||||||
}
|
}
|
||||||
ast_hashtab_end_traversal(iter);
|
ast_hashtab_end_traversal(iter);
|
||||||
|
@ -6640,6 +6641,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_
|
||||||
ft = ast_tvdiff_us(enddeltime, begintime);
|
ft = ast_tvdiff_us(enddeltime, begintime);
|
||||||
ft /= 1000000.0;
|
ft /= 1000000.0;
|
||||||
ast_verb(3,"Total time merge_contexts_delete: %8.6f sec\n", ft);
|
ast_verb(3,"Total time merge_contexts_delete: %8.6f sec\n", ft);
|
||||||
|
ast_verb(3, "%s successfully loaded %d contexts (enable debug for details).\n", registrar, ctx_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -6699,7 +6701,7 @@ int ast_context_add_include2(struct ast_context *con, const char *value,
|
||||||
ast_unlock_context(con);
|
ast_unlock_context(con);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
ast_verb(3, "Including context '%s' in context '%s'\n",
|
ast_debug(1, "Including context '%s' in context '%s'\n",
|
||||||
ast_get_include_name(new_include), ast_get_context_name(con));
|
ast_get_include_name(new_include), ast_get_context_name(con));
|
||||||
|
|
||||||
ast_unlock_context(con);
|
ast_unlock_context(con);
|
||||||
|
@ -7516,14 +7518,6 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tmp->matchcid == AST_EXT_MATCHCID_ON) {
|
|
||||||
ast_verb(3, "Added extension '%s' priority %d (CID match '%s') to %s\n",
|
|
||||||
tmp->name, tmp->priority, tmp->cidmatch_display, con->name);
|
|
||||||
} else {
|
|
||||||
ast_verb(3, "Added extension '%s' priority %d to %s\n",
|
|
||||||
tmp->name, tmp->priority, con->name);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue