Merge "res_odbc: Make pooling option deprecation notice more useful." into 13

This commit is contained in:
Joshua Colp
2016-09-22 07:10:50 -05:00
committed by Gerrit Code Review

View File

@@ -523,7 +523,7 @@ static int load_odbc_config(void)
!strncasecmp(v->name, "share", 5) || !strncasecmp(v->name, "share", 5) ||
!strcasecmp(v->name, "limit") || !strcasecmp(v->name, "limit") ||
!strcasecmp(v->name, "idlecheck")) { !strcasecmp(v->name, "idlecheck")) {
ast_log(LOG_WARNING, "The 'pooling', 'shared_connections', 'limit', and 'idlecheck' options are deprecated. Please see UPGRADE.txt for information\n"); ast_log(LOG_WARNING, "The 'pooling', 'shared_connections', 'limit', and 'idlecheck' options were replaced by 'max_connections'. See res_odbc.conf.sample.\n");
} else if (!strcasecmp(v->name, "enabled")) { } else if (!strcasecmp(v->name, "enabled")) {
enabled = ast_true(v->value); enabled = ast_true(v->value);
} else if (!strcasecmp(v->name, "pre-connect")) { } else if (!strcasecmp(v->name, "pre-connect")) {