summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2011-11-29 18:43:16 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2011-11-29 18:43:16 +0000
commit77b670c4ab62db2fa2386e15aa6ae4860bb401c9 (patch)
treefba9c5d22c4c3dea695dac6c51a49316f6381b4d /res
parentd7dec4f14fc018d18ed480358f9a265b81b230b9 (diff)
Allow each logging destination and console to have its own notion of the verbosity level.
Review: https://reviewboard.asterisk.org/r/1599 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@346391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_clialiases.c2
-rw-r--r--res/res_fax.c2
-rw-r--r--res/res_jabber.c4
-rw-r--r--res/res_musiconhold.c10
4 files changed, 6 insertions, 12 deletions
diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index d67f3ba39..123fe5adc 100644
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -211,7 +211,7 @@ static void load_config(int reload)
ast_cli_register(&alias->cli_entry);
ao2_link(cli_aliases, alias);
- ast_verbose(VERBOSE_PREFIX_2 "Aliased CLI command '%s' to '%s'\n", v1->name, v1->value);
+ ast_verb(2, "Aliased CLI command '%s' to '%s'\n", v1->name, v1->value);
ao2_ref(alias, -1);
}
}
diff --git a/res/res_fax.c b/res/res_fax.c
index 3b1abd2fb..bb263283c 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -3322,7 +3322,7 @@ static struct ast_frame *fax_detect_framehook(struct ast_channel *chan, struct a
if (ast_exists_extension(chan, target_context, "fax", 1,
S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
ast_channel_lock(chan);
- ast_verbose(VERBOSE_PREFIX_2 "Redirecting '%s' to fax extension due to %s detection\n",
+ ast_verb(2, "Redirecting '%s' to fax extension due to %s detection\n",
chan->name, (result == 'f') ? "CNG" : "T38");
pbx_builtin_setvar_helper(chan, "FAXEXTEN", chan->exten);
if (ast_async_goto(chan, target_context, "fax", 1)) {
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 870508d03..f1e9c740c 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -2615,9 +2615,7 @@ static void aji_handle_subscribe(struct aji_client *client, ikspak *pak)
ASTOBJ_UNREF(buddy, ast_aji_buddy_destroy);
}
default:
- if (option_verbose > 4) {
- ast_verbose(VERBOSE_PREFIX_3 "JABBER: This is a subcription of type %i\n", pak->subtype);
- }
+ ast_verb(5, "JABBER: This is a subcription of type %i\n", pak->subtype);
}
}
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index d5f9e2c6f..ffe051eaa 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -268,9 +268,7 @@ static void moh_files_release(struct ast_channel *chan, void *data)
chan->stream = NULL;
}
- if (option_verbose > 2) {
- ast_verbose(VERBOSE_PREFIX_3 "Stopped music on hold on %s\n", chan->name);
- }
+ ast_verb(3, "Stopped music on hold on %s\n", chan->name);
ast_format_clear(&state->mohwfmt); /* make sure to clear this format before restoring the original format. */
if (state->origwfmt.id && ast_set_write_format(chan, &state->origwfmt)) {
@@ -1154,10 +1152,8 @@ static int init_files_class(struct mohclass *class)
}
if (!res) {
- if (option_verbose > 2) {
- ast_verbose(VERBOSE_PREFIX_3 "Files not found in %s for moh class:%s\n",
- class->dir, class->name);
- }
+ ast_verb(3, "Files not found in %s for moh class:%s\n",
+ class->dir, class->name);
return -1;
}