diff options
| -rw-r--r-- | pbx/pbx_ael.c | 12 | ||||
| -rw-r--r-- | res/ael/ael.flex | 2 | ||||
| -rw-r--r-- | res/ael/ael_lex.c | 2 | ||||
| -rw-r--r-- | utils/Makefile | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 5c42732bf..a76bfa03e 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -161,7 +161,7 @@ static int pbx_load_module(void) struct pval *parse_tree; - ast_log(LOG_NOTICE, "Starting AEL load process.\n"); + ast_debug(1, "Starting AEL load process.\n"); if (config[0] == '/') rfilename = (char *)config; else { @@ -174,25 +174,25 @@ static int pbx_load_module(void) } parse_tree = ael2_parse(rfilename, &errs); - ast_log(LOG_NOTICE, "AEL load process: parsed config file name '%s'.\n", rfilename); + ast_debug(1, "AEL load process: parsed config file name '%s'.\n", rfilename); ael2_semantic_check(parse_tree, &sem_err, &sem_warn, &sem_note); if (errs == 0 && sem_err == 0) { - ast_log(LOG_NOTICE, "AEL load process: checked config file name '%s'.\n", rfilename); + ast_debug(1, "AEL load process: checked config file name '%s'.\n", rfilename); local_table = ast_hashtab_create(11, ast_hashtab_compare_contexts, ast_hashtab_resize_java, ast_hashtab_newsize_java, ast_hashtab_hash_contexts, 0); if (ast_compile_ael2(&local_contexts, local_table, parse_tree)) { ast_log(LOG_ERROR, "AEL compile failed! Aborting.\n"); destroy_pval(parse_tree); /* free up the memory */ return AST_MODULE_LOAD_DECLINE; } - ast_log(LOG_NOTICE, "AEL load process: compiled config file name '%s'.\n", rfilename); + ast_debug(1, "AEL load process: compiled config file name '%s'.\n", rfilename); ast_merge_contexts_and_delete(&local_contexts, local_table, registrar); local_table = NULL; /* it's the dialplan global now */ local_contexts = NULL; - ast_log(LOG_NOTICE, "AEL load process: merged config file name '%s'.\n", rfilename); + ast_debug(1, "AEL load process: merged config file name '%s'.\n", rfilename); for (con = ast_walk_contexts(NULL); con; con = ast_walk_contexts(con)) ast_context_verify_includes(con); - ast_log(LOG_NOTICE, "AEL load process: verified config file name '%s'.\n", rfilename); + ast_debug(1, "AEL load process: verified config file name '%s'.\n", rfilename); } else { ast_log(LOG_ERROR, "Sorry, but %d syntax errors and %d semantic errors were detected. It doesn't make sense to compile.\n", errs, sem_err); destroy_pval(parse_tree); /* free up the memory */ diff --git a/res/ael/ael.flex b/res/ael/ael.flex index dab6ac05c..0b6ec32f1 100644 --- a/res/ael/ael.flex +++ b/res/ael/ael.flex @@ -885,7 +885,7 @@ static void setup_filestack(char *fnamebuf2, int fnamebuf_siz, glob_t *globbuf, ast_log(LOG_ERROR, "fread() failed: %s\n", strerror(errno)); } buffer[stats.st_size] = 0; - ast_log(LOG_NOTICE," --Read in included file %s, %d chars\n",fnamebuf2, (int)stats.st_size); + ast_debug(1, " --Read in included file %s, %d chars\n",fnamebuf2, (int)stats.st_size); fclose(in1); if (include_stack[include_stack_index].fname) { free(include_stack[include_stack_index].fname); diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c index e255fab70..6aec03bee 100644 --- a/res/ael/ael_lex.c +++ b/res/ael/ael_lex.c @@ -3458,7 +3458,7 @@ static void setup_filestack(char *fnamebuf2, int fnamebuf_siz, glob_t *globbuf, ast_log(LOG_ERROR, "fread() failed: %s\n", strerror(errno)); } buffer[stats.st_size] = 0; - ast_log(LOG_NOTICE," --Read in included file %s, %d chars\n",fnamebuf2, (int)stats.st_size); + ast_debug(1, " --Read in included file %s, %d chars\n",fnamebuf2, (int)stats.st_size); fclose(in1); if (include_stack[include_stack_index].fname) { free(include_stack[include_stack_index].fname); diff --git a/utils/Makefile b/utils/Makefile index 11905fb5c..f0f2a5d78 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -142,10 +142,16 @@ aelbison.o: _ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael -DYYENABLE_NLS=0 pbx_ael.c: $(ASTTOPDIR)/pbx/pbx_ael.c $(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@" $(CMD_PREFIX) cp "$<" "$@" + $(ECHO_PREFIX) echo " [SED] $@" + $(CMD_PREFIX) sed 's/ast_debug([[:digit:]][[:digit:]]*/ast_log(LOG_DEBUG/' "$@" > "$@.new" + $(CMD_PREFIX) mv "$@.new" "$@" aelparse.c: $(ASTTOPDIR)/res/ael/ael_lex.c $(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@" $(CMD_PREFIX) cp "$<" "$@" + $(ECHO_PREFIX) echo " [SED] $@" + $(CMD_PREFIX) sed 's/ast_debug([[:digit:]][[:digit:]]*/ast_log(LOG_DEBUG/' "$@" > "$@.new" + $(CMD_PREFIX) mv "$@.new" "$@" aelparse.o: _ASTCFLAGS+=-I$(ASTTOPDIR)/res -Wno-unused aelparse: LIBS+=-lm |