Reduce startup/shutdown verbose logging

When started with a verbose level of 3, asterisk can emit over 1500
verbose message that serve no real purpose other than to fill up
logs. When asterisk shuts down, it emits another 1100 that are of
even less use. Since the testsuite runs asterisk with a verbose
level of 3, and asterisk starts and stops for every one of the 700+
tests, the number of log messages is staggering.  Besides taking up
resources, it also makes it hard to debug failing tests.

This commit changes the log level for those verbose messages to 5
instead of 3 which reduces the number of log messages to only a
handful. Of course, NOTICE, WARNING and ERROR message are
unaffected.

There's also one other minor change...
ast_context_remove_extension_callerid2() logs a DEBUG message
instead of an ERROR if the extension you're deleting doesn't exist.
The pjsip_config_wizard calls that function to clean up the config
and has been triggering that annoying error message for years.

Resolves: #582

diff --git a/apps/app_amd.c b/apps/app_amd.c
index fb63c7d54b2723c4482e5e8ea50f03b9123ab4e4..c505342afae8255e415660af0b9ac140b5b16ea8 100644 (file)
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -567,7 +567,7 @@ static int load_config(int reload)
 
        ast_config_destroy(cfg);
 
-       ast_verb(3, "AMD defaults: initialSilence [%d] greeting [%d] afterGreetingSilence [%d] "
+       ast_verb(5, "AMD defaults: initialSilence [%d] greeting [%d] afterGreetingSilence [%d] "
                "totalAnalysisTime [%d] minimumWordLength [%d] betweenWordsSilence [%d] maximumNumberOfWords [%d] silenceThreshold [%d] maximumWordLength [%d]\n",
                dfltInitialSilence, dfltGreeting, dfltAfterGreetingSilence, dfltTotalAnalysisTime,
                dfltMinimumWordLength, dfltBetweenWordsSilence, dfltMaximumNumberOfWords, dfltSilenceThreshold, dfltMaximumWordLength);

diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 0354bd57d42b8e046fd3ef4f2aa2e5d11fdf7de0..85f092d97f406c866dc7aec459aca72a905eef18 100644 (file)
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -597,20 +597,20 @@ static int parse_config(int reload)
                if (!strcasecmp(var->name, "quality")) {
                        res = abs(atoi(var->value));
                        if (res > -1 && res < 11) {
-                               ast_verb(3, "CODEC SPEEX: Setting Quality to %d\n",res);
+                               ast_verb(5, "CODEC SPEEX: Setting Quality to %d\n",res);
                                quality = res;
                        } else
                                ast_log(LOG_ERROR,"Error Quality must be 0-10\n");
                } else if (!strcasecmp(var->name, "complexity")) {
                        res = abs(atoi(var->value));
                        if (res > -1 && res < 11) {
-                               ast_verb(3, "CODEC SPEEX: Setting Complexity to %d\n",res);
+                               ast_verb(5, "CODEC SPEEX: Setting Complexity to %d\n",res);
                                complexity = res;
                        } else
                                ast_log(LOG_ERROR,"Error! Complexity must be 0-10\n");
                } else if (!strcasecmp(var->name, "vbr_quality")) {
                        if (sscanf(var->value, "%30f", &res_f) == 1 && res_f >= 0 && res_f <= 10) {
-                               ast_verb(3, "CODEC SPEEX: Setting VBR Quality to %f\n",res_f);
+                               ast_verb(5, "CODEC SPEEX: Setting VBR Quality to %f\n",res_f);
                                vbr_quality = res_f;
                        } else
                                ast_log(LOG_ERROR,"Error! VBR Quality must be 0-10\n");
@@ -618,62 +618,62 @@ static int parse_config(int reload)
                        ast_log(LOG_ERROR,"Error! ABR Quality setting obsolete, set ABR to desired bitrate\n");
                } else if (!strcasecmp(var->name, "enhancement")) {
                        enhancement = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: Perceptual Enhancement Mode. [%s]\n",enhancement ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: Perceptual Enhancement Mode. [%s]\n",enhancement ? "on" : "off");
                } else if (!strcasecmp(var->name, "vbr")) {
                        vbr = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: VBR Mode. [%s]\n",vbr ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: VBR Mode. [%s]\n",vbr ? "on" : "off");
                } else if (!strcasecmp(var->name, "abr")) {
                        res = abs(atoi(var->value));
                        if (res >= 0) {
                                        if (res > 0)
-                                       ast_verb(3, "CODEC SPEEX: Setting ABR target bitrate to %d\n",res);
+                                       ast_verb(5, "CODEC SPEEX: Setting ABR target bitrate to %d\n",res);
                                        else
-                                       ast_verb(3, "CODEC SPEEX: Disabling ABR\n");
+                                       ast_verb(5, "CODEC SPEEX: Disabling ABR\n");
                                abr = res;
                        } else
                                ast_log(LOG_ERROR,"Error! ABR target bitrate must be >= 0\n");
                } else if (!strcasecmp(var->name, "vad")) {
                        vad = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: VAD Mode. [%s]\n",vad ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: VAD Mode. [%s]\n",vad ? "on" : "off");
                } else if (!strcasecmp(var->name, "dtx")) {
                        dtx = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: DTX Mode. [%s]\n",dtx ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: DTX Mode. [%s]\n",dtx ? "on" : "off");
                } else if (!strcasecmp(var->name, "preprocess")) {
                        preproc = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: Preprocessing. [%s]\n",preproc ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: Preprocessing. [%s]\n",preproc ? "on" : "off");
                } else if (!strcasecmp(var->name, "pp_vad")) {
                        pp_vad = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: Preprocessor VAD. [%s]\n",pp_vad ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: Preprocessor VAD. [%s]\n",pp_vad ? "on" : "off");
                } else if (!strcasecmp(var->name, "pp_agc")) {
                        pp_agc = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: Preprocessor AGC. [%s]\n",pp_agc ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: Preprocessor AGC. [%s]\n",pp_agc ? "on" : "off");
                } else if (!strcasecmp(var->name, "pp_agc_level")) {
                        if (sscanf(var->value, "%30f", &res_f) == 1 && res_f >= 0) {
-                               ast_verb(3, "CODEC SPEEX: Setting preprocessor AGC Level to %f\n",res_f);
+                               ast_verb(5, "CODEC SPEEX: Setting preprocessor AGC Level to %f\n",res_f);
                                pp_agc_level = res_f;
                        } else
                                ast_log(LOG_ERROR,"Error! Preprocessor AGC Level must be >= 0\n");
                } else if (!strcasecmp(var->name, "pp_denoise")) {
                        pp_denoise = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: Preprocessor Denoise. [%s]\n",pp_denoise ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: Preprocessor Denoise. [%s]\n",pp_denoise ? "on" : "off");
                } else if (!strcasecmp(var->name, "pp_dereverb")) {
                        pp_dereverb = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: Preprocessor Dereverb. [%s]\n",pp_dereverb ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: Preprocessor Dereverb. [%s]\n",pp_dereverb ? "on" : "off");
                } else if (!strcasecmp(var->name, "pp_dereverb_decay")) {
                        if (sscanf(var->value, "%30f", &res_f) == 1 && res_f >= 0) {
-                               ast_verb(3, "CODEC SPEEX: Setting preprocessor Dereverb Decay to %f\n",res_f);
+                               ast_verb(5, "CODEC SPEEX: Setting preprocessor Dereverb Decay to %f\n",res_f);
                                pp_dereverb_decay = res_f;
                        } else
                                ast_log(LOG_ERROR,"Error! Preprocessor Dereverb Decay must be >= 0\n");
                } else if (!strcasecmp(var->name, "pp_dereverb_level")) {
                        if (sscanf(var->value, "%30f", &res_f) == 1 && res_f >= 0) {
-                               ast_verb(3, "CODEC SPEEX: Setting preprocessor Dereverb Level to %f\n",res_f);
+                               ast_verb(5, "CODEC SPEEX: Setting preprocessor Dereverb Level to %f\n",res_f);
                                pp_dereverb_level = res_f;
                        } else
                                ast_log(LOG_ERROR,"Error! Preprocessor Dereverb Level must be >= 0\n");
                } else if (!strcasecmp(var->name, "experimental_rtcp_feedback")) {
                        exp_rtcp_fb = ast_true(var->value) ? 1 : 0;
-                       ast_verb(3, "CODEC SPEEX: Experimental RTCP Feedback. [%s]\n",exp_rtcp_fb ? "on" : "off");
+                       ast_verb(5, "CODEC SPEEX: Experimental RTCP Feedback. [%s]\n",exp_rtcp_fb ? "on" : "off");
                }
        }
        ast_config_destroy(cfg);

diff --git a/main/bridge.c b/main/bridge.c
index 8299a1967acaa015dfecf48f37498b4ed2e03409..4b380ed48d8a2f9c5c2df8aa49bb8fa08d3ef108 100644 (file)
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -255,7 +255,7 @@ int __ast_bridge_technology_register(struct ast_bridge_technology *technology, s
 
        AST_RWLIST_UNLOCK(&bridge_technologies);
 
-       ast_verb(2, "Registered bridge technology %s\n", technology->name);
+       ast_verb(5, "Registered bridge technology %s\n", technology->name);
 
        return 0;
 }
@@ -270,7 +270,7 @@ int ast_bridge_technology_unregister(struct ast_bridge_technology *technology)
        AST_RWLIST_TRAVERSE_SAFE_BEGIN(&bridge_technologies, current, entry) {
                if (current == technology) {
                        AST_RWLIST_REMOVE_CURRENT(entry);
-                       ast_verb(2, "Unregistered bridge technology %s\n", technology->name);
+                       ast_verb(5, "Unregistered bridge technology %s\n", technology->name);
                        break;
                }
        }

diff --git a/main/bucket.c b/main/bucket.c
index 01934f328ac5ea58533523747435ef244779aa27..883bbb15ec3afa48db36457ca25fc836aeeeec63 100644 (file)
--- a/main/bucket.c
+++ b/main/bucket.c
@@ -305,7 +305,7 @@ int __ast_bucket_scheme_register(const char *name, struct ast_sorcery_wizard *bu
 
        ao2_link_flags(schemes, scheme, OBJ_NOLOCK);
 
-       ast_verb(2, "Registered bucket scheme '%s'\n", name);
+       ast_verb(5, "Registered bucket scheme '%s'\n", name);
 
        ast_module_shutdown_ref(module);
 

diff --git a/main/cdr.c b/main/cdr.c
index 8f1f30b0a14b3122d0983df96d089da4fd0ebd19..0bf319b8b7348f08854c594a9903853061078d54 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -3041,7 +3041,7 @@ static int ast_cdr_generic_unregister(struct be_list *generic_list, const char *
        AST_RWLIST_REMOVE(generic_list, match, list);
        AST_RWLIST_UNLOCK(generic_list);
 
-       ast_verb(2, "Unregistered '%s' CDR backend\n", name);
+       ast_verb(5, "Unregistered '%s' CDR backend\n", name);
        ast_free(match);
 
        return 0;

diff --git a/main/channel.c b/main/channel.c
index 97ba2855d52c717c2ae25ab78c5dc8c2aac113df..6c69680017271a125d53a21ab168e8eab83526b1 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -557,9 +557,9 @@ int ast_channel_register(const struct ast_channel_tech *tech)
        chan->tech = tech;
        AST_RWLIST_INSERT_HEAD(&backends, chan, list);
 
-       ast_debug(1, "Registered handler for '%s' (%s)\n", chan->tech->type, chan->tech->description);
+       ast_debug(5, "Registered handler for '%s' (%s)\n", chan->tech->type, chan->tech->description);
 
-       ast_verb(2, "Registered channel type '%s' (%s)\n", chan->tech->type, chan->tech->description);
+       ast_verb(5, "Registered channel type '%s' (%s)\n", chan->tech->type, chan->tech->description);
 
        AST_RWLIST_UNLOCK(&backends);
 
@@ -571,7 +571,7 @@ void ast_channel_unregister(const struct ast_channel_tech *tech)
 {
        struct chanlist *chan;
 
-       ast_debug(1, "Unregistering channel type '%s'\n", tech->type);
+       ast_debug(5, "Unregistering channel type '%s'\n", tech->type);
 
        AST_RWLIST_WRLOCK(&backends);
 
@@ -579,7 +579,7 @@ void ast_channel_unregister(const struct ast_channel_tech *tech)
                if (chan->tech == tech) {
                        AST_LIST_REMOVE_CURRENT(list);
                        ast_free(chan);
-                       ast_verb(2, "Unregistered channel type '%s'\n", tech->type);
+                       ast_verb(5, "Unregistered channel type '%s'\n", tech->type);
                        break;
                }
        }

diff --git a/main/codec.c b/main/codec.c
index 32350f1b49bf37e3bb6b7152157eb4a4385ee39e..90044d76f639f408517760e4b8a340197555474a 100644 (file)
--- a/main/codec.c
+++ b/main/codec.c
@@ -315,7 +315,7 @@ int __ast_codec_register_with_format(struct ast_codec *codec, const char *format
        /* Once registered a codec can not be unregistered, and the module must persist until shutdown */
        ast_module_shutdown_ref(mod);
 
-       ast_verb(2, "Registered '%s' codec '%s' at sample rate '%u' with id '%u'\n",
+       ast_verb(5, "Registered '%s' codec '%s' at sample rate '%u' with id '%u'\n",
                ast_codec_media_type2str(codec->type), codec->name, codec->sample_rate, codec_new->external.id);
 
        ao2_ref(codec_new, -1);

diff --git a/main/config.c b/main/config.c
index 49bbe6d95b5f42d85672d29daa4bb33efda9b3a5..10086c2e7fc939c05ad5912dba4534e1bbb4e8d9 100644 (file)
--- a/main/config.c
+++ b/main/config.c
@@ -3068,7 +3068,7 @@ static int ast_realtime_append_mapping(const char *name, const char *driver, con
        map->next = config_maps;
        config_maps = map;
 
-       ast_verb(2, "Binding %s to %s/%s/%s\n", map->name, map->driver, map->database, map->table ? map->table : map->name);
+       ast_verb(5, "Binding %s to %s/%s/%s\n", map->name, map->driver, map->database, map->table ? map->table : map->name);
 
        return 0;
 }

diff --git a/main/dns_core.c b/main/dns_core.c
index 0fb0731e92a3a0fbd7dcec5f383b1f5f29424777..b2b9d1b06629dcab16d77e893bb6f0a7f9f3f31b 100644 (file)
--- a/main/dns_core.c
+++ b/main/dns_core.c
@@ -672,7 +672,7 @@ int ast_dns_resolver_register(struct ast_dns_resolver *resolver)
 
        AST_RWLIST_UNLOCK(&resolvers);
 
-       ast_verb(2, "Registered DNS resolver '%s' with priority '%d'\n", resolver->name, resolver->priority);
+       ast_verb(5, "Registered DNS resolver '%s' with priority '%d'\n", resolver->name, resolver->priority);
 
        return 0;
 }
@@ -695,7 +695,7 @@ void ast_dns_resolver_unregister(struct ast_dns_resolver *resolver)
        AST_RWLIST_TRAVERSE_SAFE_END;
        AST_RWLIST_UNLOCK(&resolvers);
 
-       ast_verb(2, "Unregistered DNS resolver '%s'\n", resolver->name);
+       ast_verb(5, "Unregistered DNS resolver '%s'\n", resolver->name);
 }
 
 char *dns_find_record(const char *record, size_t record_size, const char *response, size_t response_size)

diff --git a/main/file.c b/main/file.c
index 3a9622095015dadbbcaebbc0562236e944064543..959da3d945c06414528998462a52e524ec3557ad 100644 (file)
--- a/main/file.c
+++ b/main/file.c
@@ -153,7 +153,7 @@ int __ast_format_def_register(const struct ast_format_def *f, struct ast_module
 
        AST_RWLIST_INSERT_HEAD(&formats, tmp, list);
        AST_RWLIST_UNLOCK(&formats);
-       ast_verb(2, "Registered file format %s, extension(s) %s\n", f->name, f->exts);
+       ast_verb(5, "Registered file format %s, extension(s) %s\n", f->name, f->exts);
        publish_format_update(f, ast_format_register_type());
 
        return 0;
@@ -177,7 +177,7 @@ int ast_format_def_unregister(const char *name)
        AST_RWLIST_UNLOCK(&formats);
 
        if (!res)
-               ast_verb(2, "Unregistered format %s\n", name);
+               ast_verb(5, "Unregistered format %s\n", name);
        else
                ast_log(LOG_WARNING, "Tried to unregister format %s, already unregistered\n", name);
 

diff --git a/main/format.c b/main/format.c
index f0da43c53a32daf89d01cbdf3296d77653bcfe81..f073b66570667e99008c24abe3fcc80dd946b63a 100644 (file)
--- a/main/format.c
+++ b/main/format.c
@@ -117,7 +117,7 @@ int __ast_format_interface_register(const char *codec, const struct ast_format_i
        ao2_link_flags(interfaces, format_interface, OBJ_NOLOCK);
        ao2_ref(format_interface, -1);
 
-       ast_verb(2, "Registered format interface for codec '%s'\n", codec);
+       ast_verb(5, "Registered format interface for codec '%s'\n", codec);
 
        return 0;
 }

diff --git a/main/format_cache.c b/main/format_cache.c
index 3ce8ee02bc88825c8431e04cb610870a1f153b6a..e5f8c63d3292b2d536be7802fbd0a38551231b23 100644 (file)
--- a/main/format_cache.c
+++ b/main/format_cache.c
@@ -498,7 +498,7 @@ int ast_format_cache_set(struct ast_format *format)
 
        set_cached_format(ast_format_get_name(format), format);
 
-       ast_verb(2, "%s cached format with name '%s'\n",
+       ast_verb(5, "%s cached format with name '%s'\n",
                old_format ? "Updated" : "Created",
                ast_format_get_name(format));
 

diff --git a/main/image.c b/main/image.c
index b007ae1602a140043f876dfe985a012d11b71555..f4ea11fc0199b28cfef26b3a86a857afb5dbb533 100644 (file)
--- a/main/image.c
+++ b/main/image.c
@@ -50,7 +50,7 @@ int ast_image_register(struct ast_imager *img)
        AST_RWLIST_WRLOCK(&imagers);
        AST_RWLIST_INSERT_HEAD(&imagers, img, list);
        AST_RWLIST_UNLOCK(&imagers);
-       ast_verb(2, "Registered format '%s' (%s)\n", img->name, img->desc);
+       ast_verb(5, "Registered format '%s' (%s)\n", img->name, img->desc);
        return 0;
 }
 
@@ -61,7 +61,7 @@ void ast_image_unregister(struct ast_imager *img)
        AST_RWLIST_UNLOCK(&imagers);
 
        if (img)
-               ast_verb(2, "Unregistered format '%s' (%s)\n", img->name, img->desc);
+               ast_verb(5, "Unregistered format '%s' (%s)\n", img->name, img->desc);
 }
 
 int ast_supports_images(struct ast_channel *chan)

diff --git a/main/indications.c b/main/indications.c
index ccbf1b3bb43d075a689960755e5a321522337512..a5857b7a305ba2b6f33a3e756a8df8ab0567fbf5 100644 (file)
--- a/main/indications.c
+++ b/main/indications.c
@@ -539,7 +539,7 @@ static int ast_register_indication_country(struct ast_tone_zone *zone)
 
        ao2_link(ast_tone_zones, zone);
 
-       ast_verb(3, "Registered indication country '%s'\n", zone->country);
+       ast_verb(5, "Registered indication country '%s'\n", zone->country);
 
        return 0;
 }

diff --git a/main/loader.c b/main/loader.c
index 9f8587d731d6662ece034c0b33f420e6abfba707..ecad2346e11de67d8ee9b58f53d0592d7333bf65 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -1192,7 +1192,7 @@ int modules_shutdown(void)
                        }
                        AST_DLLIST_REMOVE_CURRENT(entry);
                        if (mod->flags.running && !mod->flags.declined && mod->info->unload) {
-                               ast_verb(1, "Unloading %s\n", mod->resource);
+                               ast_verb(4, "Unloading %s\n", mod->resource);
                                mod->info->unload();
                        }
                        module_destroy(mod);
@@ -1259,7 +1259,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
                /* Request any channels attached to the module to hangup. */
                __ast_module_user_hangup_all(mod);
 
-               ast_verb(1, "Unloading %s\n", mod->resource);
+               ast_verb(4, "Unloading %s\n", mod->resource);
                res = mod->info->unload();
                if (res) {
                        ast_log(LOG_WARNING, "Firm unload failed for %s\n", resource_name);
@@ -1713,16 +1713,16 @@ static enum ast_module_load_result start_resource(struct ast_module *mod)
        }
 
        if (!ast_fully_booted) {
-               ast_verb(1, "Loading %s.\n", mod->resource);
+               ast_verb(4, "Loading %s.\n", mod->resource);
        }
        res = mod->info->load();
 
        switch (res) {
        case AST_MODULE_LOAD_SUCCESS:
                if (!ast_fully_booted) {
-                       ast_verb(2, "%s => (%s)\n", mod->resource, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp)));
+                       ast_verb(5, "%s => (%s)\n", mod->resource, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp)));
                } else {
-                       ast_verb(1, "Loaded %s => (%s)\n", mod->resource, mod->info->description);
+                       ast_verb(4, "Loaded %s => (%s)\n", mod->resource, mod->info->description);
                }
 
                mod->flags.running = 1;

diff --git a/main/manager.c b/main/manager.c
index 46bcc9493b36bd3e90313cce7d616ab6accd7746..20b434f1eb8bfe438f54ae448b258f62f9ba9bba 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -7955,7 +7955,7 @@ int ast_manager_unregister(const char *action)
                ao2_unlock(cur);
 
                ao2_t_ref(cur, -1, "action object removed from list");
-               ast_verb(2, "Manager unregistered action %s\n", action);
+               ast_verb(5, "Manager unregistered action %s\n", action);
        }
 
        return 0;
@@ -8030,7 +8030,7 @@ static int ast_manager_register_struct(struct manager_action *act)
                AST_RWLIST_INSERT_HEAD(&actions, act, list);
        }
 
-       ast_verb(2, "Manager registered action %s\n", act->action);
+       ast_verb(5, "Manager registered action %s\n", act->action);
 
        AST_RWLIST_UNLOCK(&actions);
 

diff --git a/main/message.c b/main/message.c
index a1e22ba4b980a1bc32e88210c2b236486843b4d6..c661621f51b44d2831386c3226d82a30534311c8 100644 (file)
--- a/main/message.c
+++ b/main/message.c
@@ -1614,7 +1614,7 @@ int ast_msg_tech_register(const struct ast_msg_tech *tech)
                ast_rwlock_unlock(&msg_techs_lock);
                return -1;
        }
-       ast_verb(3, "Message technology '%s' registered.\n", tech->name);
+       ast_verb(5, "Message technology '%s' registered.\n", tech->name);
 
        ast_rwlock_unlock(&msg_techs_lock);
 
@@ -1649,7 +1649,7 @@ int ast_msg_tech_unregister(const struct ast_msg_tech *tech)
                return -1;
        }
 
-       ast_verb(2, "Message technology '%s' unregistered.\n", tech->name);
+       ast_verb(5, "Message technology '%s' unregistered.\n", tech->name);
 
        return 0;
 }
@@ -1674,7 +1674,7 @@ int ast_msg_handler_register(const struct ast_msg_handler *handler)
                ast_rwlock_unlock(&msg_handlers_lock);
                return -1;
        }
-       ast_verb(2, "Message handler '%s' registered.\n", handler->name);
+       ast_verb(5, "Message handler '%s' registered.\n", handler->name);
 
        ast_rwlock_unlock(&msg_handlers_lock);
 
@@ -1710,7 +1710,7 @@ int ast_msg_handler_unregister(const struct ast_msg_handler *handler)
                return -1;
        }
 
-       ast_verb(3, "Message handler '%s' unregistered.\n", handler->name);
+       ast_verb(5, "Message handler '%s' unregistered.\n", handler->name);
        return 0;
 }
 

diff --git a/main/pbx.c b/main/pbx.c
index a641fcbd08a45f60d8c3db89aef38bd11558a2c9..95d8cec8351a4b1d85e7a38a1b6d88215331c3e8 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -5068,7 +5068,7 @@ int ast_context_remove_extension_callerid2(struct ast_context *con, const char *
                                        }
                                }
                        } else {
-                               ast_log(LOG_ERROR,"Could not find priority %d of exten %s in context %s!\n",
+                               ast_debug(3,"Could not find priority %d of exten %s in context %s!\n",
                                                priority, exten->name, con->name);
                        }
                }
@@ -6685,20 +6685,20 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_
 
        ft = ast_tvdiff_us(writelocktime, begintime);
        ft /= 1000000.0;
-       ast_verb(3,"Time to scan old dialplan and merge leftovers back into the new: %8.6f sec\n", ft);
+       ast_verb(5,"Time to scan old dialplan and merge leftovers back into the new: %8.6f sec\n", ft);
 
        ft = ast_tvdiff_us(endlocktime, writelocktime);
        ft /= 1000000.0;
-       ast_verb(3,"Time to restore hints and swap in new dialplan: %8.6f sec\n", ft);
+       ast_verb(5,"Time to restore hints and swap in new dialplan: %8.6f sec\n", ft);
 
        ft = ast_tvdiff_us(enddeltime, endlocktime);
        ft /= 1000000.0;
-       ast_verb(3,"Time to delete the old dialplan: %8.6f sec\n", ft);
+       ast_verb(5,"Time to delete the old dialplan: %8.6f sec\n", ft);
 
        ft = ast_tvdiff_us(enddeltime, begintime);
        ft /= 1000000.0;
-       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);
+       ast_verb(5,"Total time merge_contexts_delete: %8.6f sec\n", ft);
+       ast_verb(5, "%s successfully loaded %d contexts (enable debug for details).\n", registrar, ctx_count);
 }
 
 /*
@@ -8179,7 +8179,7 @@ void __ast_context_destroy(struct ast_context *list, struct ast_hashtab *context
                                                if (!prio_item->registrar || strcmp(prio_item->registrar, registrar) != 0) {
                                                        continue;
                                                }
-                                               ast_verb(3, "Remove %s/%s/%d, registrar=%s; con=%s(%p); con->root=%p\n",
+                                               ast_verb(5, "Remove %s/%s/%d, registrar=%s; con=%s(%p); con->root=%p\n",
                                                                 tmp->name, prio_item->name, prio_item->priority, registrar, con? con->name : "<nil>", con, con? con->root_table: NULL);
                                                ast_copy_string(extension, prio_item->exten, sizeof(extension));
                                                if (prio_item->cidmatch) {
@@ -8473,7 +8473,7 @@ int load_pbx(void)
        /* Initialize the PBX */
        ast_verb(1, "Asterisk PBX Core Initializing\n");
 
-       ast_verb(2, "Registering builtin functions:\n");
+       ast_verb(5, "Registering builtin functions:\n");
        ast_cli_register_multiple(pbx_cli, ARRAY_LEN(pbx_cli));
        __ast_custom_function_register(&exception_function, NULL);
        __ast_custom_function_register(&testtime_function, NULL);

diff --git a/main/pbx_app.c b/main/pbx_app.c
index 6726a900b6fb4e47136bf8bc9713231fbf1a0a71..ecbca1d85f9ad3a66f11aa823009d938889795a0 100644 (file)
--- a/main/pbx_app.c
+++ b/main/pbx_app.c
@@ -182,7 +182,7 @@ int ast_register_application2(const char *app, int (*execute)(struct ast_channel
        if (!cur)
                AST_RWLIST_INSERT_TAIL(&apps, tmp, list);
 
-       ast_verb(2, "Registered application '" COLORIZE_FMT "'\n", COLORIZE(COLOR_BRCYAN, 0, tmp->name));
+       ast_verb(5, "Registered application '" COLORIZE_FMT "'\n", COLORIZE(COLOR_BRCYAN, 0, tmp->name));
 
        AST_RWLIST_UNLOCK(&apps);
 
@@ -409,7 +409,7 @@ int ast_unregister_application(const char *app)
                        /* Found it. */
                        unreference_cached_app(cur);
                        AST_RWLIST_REMOVE_CURRENT(list);
-                       ast_verb(2, "Unregistered application '%s'\n", cur->name);
+                       ast_verb(5, "Unregistered application '%s'\n", cur->name);
                        ast_string_field_free_memory(cur);
                        ast_free(cur);
                        break;

diff --git a/main/pbx_functions.c b/main/pbx_functions.c
index fd542c9568d27aedf546e06a2a1c28e4eaa87bea..1402696b6b2b5c54bf78087a9dae7688b397c882 100644 (file)
--- a/main/pbx_functions.c
+++ b/main/pbx_functions.c
@@ -286,7 +286,7 @@ int ast_custom_function_unregister(struct ast_custom_function *acf)
                        ast_string_field_free_memory(acf);
                }
 #endif
-               ast_verb(2, "Unregistered custom function %s\n", cur->name);
+               ast_verb(5, "Unregistered custom function %s\n", cur->name);
        }
        AST_RWLIST_UNLOCK(&acf_root);
 
@@ -410,7 +410,7 @@ int __ast_custom_function_register(struct ast_custom_function *acf, struct ast_m
 
        AST_RWLIST_UNLOCK(&acf_root);
 
-       ast_verb(2, "Registered custom function '" COLORIZE_FMT "'\n", COLORIZE(COLOR_BRCYAN, 0, acf->name));
+       ast_verb(5, "Registered custom function '" COLORIZE_FMT "'\n", COLORIZE(COLOR_BRCYAN, 0, acf->name));
 
        return 0;
 }

diff --git a/main/refer.c b/main/refer.c
index 2a4a1159242074231d1a53f832d69c8dbdea8b1e..bb948944bd7332b1b4c5054f6a97efe47bafa107 100644 (file)
--- a/main/refer.c
+++ b/main/refer.c
@@ -463,7 +463,7 @@ int ast_refer_tech_register(const struct ast_refer_tech *tech)
                ast_rwlock_unlock(&refer_techs_lock);
                return -1;
        }
-       ast_verb(3, "Refer technology '%s' registered.\n", tech->name);
+       ast_verb(5, "Refer technology '%s' registered.\n", tech->name);
 
        ast_rwlock_unlock(&refer_techs_lock);
 
@@ -501,7 +501,7 @@ int ast_refer_tech_unregister(const struct ast_refer_tech *tech)
                return -1;
        }
 
-       ast_verb(2, "Refer technology '%s' unregistered.\n", tech->name);
+       ast_verb(5, "Refer technology '%s' unregistered.\n", tech->name);
 
        return 0;
 }

diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 4d3933654fb07235041e59206c13e5efd6487c30..e648a2b9ca77c3f4ea4c5d74d1892e2ef9cbaf2e 100644 (file)
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -355,7 +355,7 @@ int ast_rtp_engine_register2(struct ast_rtp_engine *engine, struct ast_module *m
 
        AST_RWLIST_UNLOCK(&engines);
 
-       ast_verb(2, "Registered RTP engine '%s'\n", engine->name);
+       ast_verb(5, "Registered RTP engine '%s'\n", engine->name);
 
        return 0;
 }
@@ -367,7 +367,7 @@ int ast_rtp_engine_unregister(struct ast_rtp_engine *engine)
        AST_RWLIST_WRLOCK(&engines);
 
        if ((current_engine = AST_RWLIST_REMOVE(&engines, engine, entry))) {
-               ast_verb(2, "Unregistered RTP engine '%s'\n", engine->name);
+               ast_verb(5, "Unregistered RTP engine '%s'\n", engine->name);
        }
 
        AST_RWLIST_UNLOCK(&engines);
@@ -399,7 +399,7 @@ int ast_rtp_glue_register2(struct ast_rtp_glue *glue, struct ast_module *module)
 
        AST_RWLIST_UNLOCK(&glues);
 
-       ast_verb(2, "Registered RTP glue '%s'\n", glue->type);
+       ast_verb(5, "Registered RTP glue '%s'\n", glue->type);
 
        return 0;
 }
@@ -411,7 +411,7 @@ int ast_rtp_glue_unregister(struct ast_rtp_glue *glue)
        AST_RWLIST_WRLOCK(&glues);
 
        if ((current_glue = AST_RWLIST_REMOVE(&glues, glue, entry))) {
-               ast_verb(2, "Unregistered RTP glue '%s'\n", glue->type);
+               ast_verb(5, "Unregistered RTP glue '%s'\n", glue->type);
        }
 
        AST_RWLIST_UNLOCK(&glues);

diff --git a/main/sorcery.c b/main/sorcery.c
index 7f0ed2d11bd20647569993cd2d856b346e268749..39396fefb5828bfbefc3b09bebab52bc1724b8b7 100644 (file)
--- a/main/sorcery.c
+++ b/main/sorcery.c
@@ -459,7 +459,7 @@ int __ast_sorcery_wizard_register(const struct ast_sorcery_wizard *interface, st
        ao2_link_flags(wizards, wizard, OBJ_NOLOCK);
        res = 0;
 
-       ast_verb(2, "Sorcery registered wizard '%s'\n", interface->name);
+       ast_verb(5, "Sorcery registered wizard '%s'\n", interface->name);
 
        NOTIFY_GLOBAL_OBSERVERS(observers, wizard_registered,
                interface->name, interface);
@@ -480,7 +480,7 @@ int ast_sorcery_wizard_unregister(const struct ast_sorcery_wizard *interface)
                NOTIFY_GLOBAL_OBSERVERS(observers, wizard_unregistering, wizard->callbacks.name, &wizard->callbacks);
                ao2_unlink(wizards, wizard);
                ao2_ref(wizard, -1);
-               ast_verb(2, "Sorcery unregistered wizard '%s'\n", interface->name);
+               ast_verb(5, "Sorcery unregistered wizard '%s'\n", interface->name);
                return 0;
        } else {
                return -1;

diff --git a/main/translate.c b/main/translate.c
index 310159863056603d72a27e0af5176ff983447c5c..e2252a429d740ab2f1e4d4ede0e14b4fb0755176 100644 (file)
--- a/main/translate.c
+++ b/main/translate.c
@@ -1297,7 +1297,7 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
 
        generate_computational_cost(t, 1);
 
-       ast_verb(2, "Registered translator '%s' from codec %s to %s, table cost, %d, computational cost %d\n",
+       ast_verb(5, "Registered translator '%s' from codec %s to %s, table cost, %d, computational cost %d\n",
                 term_color(tmp, t->name, COLOR_MAGENTA, COLOR_BLACK, sizeof(tmp)),
                 t->src_codec.name, t->dst_codec.name, t->table_cost, t->comp_cost);
 
@@ -1340,7 +1340,7 @@ int ast_unregister_translator(struct ast_translator *t)
        AST_RWLIST_TRAVERSE_SAFE_BEGIN(&translators, u, list) {
                if (u == t) {
                        AST_RWLIST_REMOVE_CURRENT(list);
-                       ast_verb(2, "Unregistered translator '%s' from codec %s to %s\n",
+                       ast_verb(5, "Unregistered translator '%s' from codec %s to %s\n",
                                term_color(tmp, t->name, COLOR_MAGENTA, COLOR_BLACK, sizeof(tmp)),
                                t->src_codec.name, t->dst_codec.name);
                        found = 1;

diff --git a/res/res_agi.c b/res/res_agi.c
index 6debae1404ea4db320f8834bdf1a98397d6628c1..7d41a7e30f5ed7d8ed6a42da8799b9a5bf3215d5 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -3848,7 +3848,7 @@ int AST_OPTIONAL_API_NAME(ast_agi_register)(struct ast_module *mod, agi_command
                AST_RWLIST_WRLOCK(&agi_commands);
                AST_LIST_INSERT_TAIL(&agi_commands, cmd, list);
                AST_RWLIST_UNLOCK(&agi_commands);
-               ast_verb(2, "AGI Command '%s' registered\n",fullcmd);
+               ast_verb(5, "AGI Command '%s' registered\n",fullcmd);
                return 1;
        } else {
                ast_log(LOG_WARNING, "Command already registered!\n");
@@ -3887,7 +3887,7 @@ int AST_OPTIONAL_API_NAME(ast_agi_unregister)(agi_command *cmd)
        AST_RWLIST_TRAVERSE_SAFE_END;
        AST_RWLIST_UNLOCK(&agi_commands);
        if (unregistered) {
-               ast_verb(2, "AGI Command '%s' unregistered\n",fullcmd);
+               ast_verb(5, "AGI Command '%s' unregistered\n",fullcmd);
        }
        return unregistered;
 }

diff --git a/res/res_audiosocket.c b/res/res_audiosocket.c
index e6f3d225d54c738f5ef40e9f5bde83396c6bfe10..9863f07b2a69c6213feaab03f8e64dd30e21adc0 100644 (file)
--- a/res/res_audiosocket.c
+++ b/res/res_audiosocket.c
@@ -326,13 +326,13 @@ struct ast_frame *ast_audiosocket_receive_frame(const int svc)
 
 static int load_module(void)
 {
-       ast_verb(1, "Loading AudioSocket Support module\n");
+       ast_verb(5, "Loading AudioSocket Support module\n");
        return AST_MODULE_LOAD_SUCCESS;
 }
 
 static int unload_module(void)
 {
-       ast_verb(1, "Unloading AudioSocket Support module\n");
+       ast_verb(5, "Unloading AudioSocket Support module\n");
        return AST_MODULE_LOAD_SUCCESS;
 }
 

diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index 9658c17bd4098e7bb3d482fdbbd8131638f37f47..9e4c0e4006e6b8eeb9df7800b0784866b0f483f7 100644 (file)
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -236,7 +236,7 @@ static void load_config(int reload)
                                continue;
                        }
                        ao2_link(cli_aliases, alias);
-                       ast_verb(2, "Aliased CLI command '%s' to '%s'\n", v1->name, v1->value);
+                       ast_verb(5, "Aliased CLI command '%s' to '%s'\n", v1->name, v1->value);
                        ao2_ref(alias, -1);
                }
        }

diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index 0339c7982328c4d15596df12593237f0806ac91c..ecbdba5fe58246799b92008847d8a485fab0ef57 100644 (file)
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -257,7 +257,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_server_add_protocol2)(struct ast_websock
        ao2_link_flags(server->protocols, protocol, OBJ_NOLOCK);
        ao2_unlock(server->protocols);
 
-       ast_verb(2, "WebSocket registered sub-protocol '%s'\n", protocol->name);
+       ast_verb(5, "WebSocket registered sub-protocol '%s'\n", protocol->name);
        ao2_ref(protocol, -1);
 
        return 0;
@@ -279,7 +279,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_server_remove_protocol)(struct ast_webso
        ao2_unlink(server->protocols, protocol);
        ao2_ref(protocol, -1);
 
-       ast_verb(2, "WebSocket unregistered sub-protocol '%s'\n", name);
+       ast_verb(5, "WebSocket unregistered sub-protocol '%s'\n", name);
 
        return 0;
 }

diff --git a/res/res_speech.c b/res/res_speech.c
index c173bd00ddcc31098f244770959ba0204030e42f..eaf325badef3dd132856ed058f39feea11686cd5 100644 (file)
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -329,14 +329,14 @@ int ast_speech_register(struct ast_speech_engine *engine)
                return -1;
        }
 
-       ast_verb(2, "Registered speech recognition engine '%s'\n", engine->name);
+       ast_verb(5, "Registered speech recognition engine '%s'\n", engine->name);
 
        /* Add to the engine linked list and make default if needed */
        AST_RWLIST_WRLOCK(&engines);
        AST_RWLIST_INSERT_HEAD(&engines, engine, list);
        if (!default_engine) {
                default_engine = engine;
-               ast_verb(2, "Made '%s' the default speech recognition engine\n", engine->name);
+               ast_verb(5, "Made '%s' the default speech recognition engine\n", engine->name);
        }
        AST_RWLIST_UNLOCK(&engines);
 
@@ -366,7 +366,7 @@ struct ast_speech_engine *ast_speech_unregister2(const char *engine_name)
                        if (engine == default_engine) {
                                default_engine = AST_RWLIST_FIRST(&engines);
                        }
-                       ast_verb(2, "Unregistered speech recognition engine '%s'\n", engine_name);
+                       ast_verb(5, "Unregistered speech recognition engine '%s'\n", engine_name);
                        /* All went well */
                        break;
                }
@@ -396,7 +396,7 @@ void ast_speech_unregister_engines(
                        if (engine == default_engine) {
                                default_engine = AST_RWLIST_FIRST(&engines);
                        }
-                       ast_verb(2, "Unregistered speech recognition engine '%s'\n", engine->name);
+                       ast_verb(5, "Unregistered speech recognition engine '%s'\n", engine->name);
                        /* All went well */
                        if (on_unregistered) {
                                on_unregistered(engine);