diff options
| author | Mark Michelson <mmichelson@digium.com> | 2016-02-04 14:10:58 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-02-04 14:10:58 -0600 |
| commit | c0a8ecc8c00ed675a038a34bfb27a3e5b093055d (patch) | |
| tree | 008446e04d56a31a4c399212952a7d74f4e54b62 /res | |
| parent | d8f1a74d15b49657d65d56b92bb744d54eda37b6 (diff) | |
| parent | dcbedf9ab187f999d4edc5d7eca252cc931040d9 (diff) | |
Merge "logging: Remove/fix some message annoyances"
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_odbc.c | 2 | ||||
| -rw-r--r-- | res/res_phoneprov.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c index 609d68a4c..81e1b3c13 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -500,7 +500,7 @@ static int load_odbc_config(void) !strncasecmp(v->name, "share", 5) || !strcasecmp(v->name, "limit") || !strcasecmp(v->name, "idlecheck")) { - ast_log(LOG_WARNING, "The 'pooling', 'shared_connections', 'limit', and 'idlecheck' options are deprecated. Please see UPGRADE.txt for information"); + ast_log(LOG_WARNING, "The 'pooling', 'shared_connections', 'limit', and 'idlecheck' options are deprecated. Please see UPGRADE.txt for information\n"); } else if (!strcasecmp(v->name, "enabled")) { enabled = ast_true(v->value); } else if (!strcasecmp(v->name, "pre-connect")) { diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index cf566b3d0..51c0b4a51 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -1476,7 +1476,6 @@ static int reload(void) ao2_lock(providers); i = ao2_iterator_init(providers, 0); for(; (provider = ao2_iterator_next(&i)); ao2_ref(provider, -1)) { - ast_log(LOG_VERBOSE, "Reloading provider '%s' users.\n", provider->provider_name); if (provider->load_users()) { ast_log(LOG_ERROR, "Unable to load provider '%s' users. Reload aborted.\n", provider->provider_name); continue; @@ -1553,7 +1552,6 @@ int ast_phoneprov_provider_register(char *provider_name, return -1; } - ast_log(LOG_VERBOSE, "Registered phoneprov provider '%s'.\n", provider_name); return 0; } @@ -1606,7 +1604,6 @@ void ast_phoneprov_provider_unregister(char *provider_name) ast_phoneprov_delete_extensions(provider_name); ao2_find(providers, provider_name, OBJ_SEARCH_KEY | OBJ_NODATA | OBJ_UNLINK); - ast_log(LOG_VERBOSE, "Unegistered phoneprov provider '%s'.\n", provider_name); } int ast_phoneprov_add_extension(char *provider_name, struct varshead *vars) @@ -1679,7 +1676,6 @@ int ast_phoneprov_add_extension(char *provider_name, struct varshead *vars) ast_log(LOG_WARNING, "Could not create http routes for '%s' - skipping\n", user->macaddress); return -1; } - ast_log(LOG_VERBOSE, "Created %s/%s for provider '%s'.\n", username, mac, provider_name); ao2_link(users, user); } else { @@ -1698,7 +1694,6 @@ int ast_phoneprov_add_extension(char *provider_name, struct varshead *vars) exten = delete_extension(exten); return -1; } - ast_log(LOG_VERBOSE, "Added %s/%s for provider '%s'.\n", username, mac, provider_name); } return 0; |