kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 06:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify the pooling functionality by changing the config file keyword

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-02-01 18:08:44 +00:00
parent 03a95a20db
commit de0d0ad137
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configs/res_odbc.conf.sample
View File

@@ -4,8 +4,9 @@
; Note that all environmental variables can be seen by all connections,
; so you can't have different values for different connections.
[ENV]
INFORMIXSERVER => my_special_database
INFORMIXDIR => /opt/informix
;INFORMIXSERVER => my_special_database
;INFORMIXDIR => /opt/informix
;ORACLE_HOME => /home/oracle
; All other sections are arbitrary names for database connections.
@@ -15,6 +16,7 @@ dsn => asterisk
;username => myuser
;password => mypass
pre-connect => yes
;
; What should we execute to ensure that our connection is still alive? The
; statement should return a non-zero value in the first field of its first
; record. The default is "select 1".
@@ -34,17 +36,18 @@ pre-connect => yes
;idlecheck => 3600
; Certain servers, such as MS SQL Server and Sybase use the TDS protocol, which
; limits the number of active queries per connection to 1. By setting up pools
; of connections, Asterisk can be made to work with these servers.
; limits the number of active queries per connection to 1. By telling res_odbc
; not to share connections, Asterisk can be made to work with these servers.
[sqlserver]
enabled => no
dsn => mickeysoft
pooling => yes
share_connections => no
limit => 5
username => oscar
password => thegrouch
pre-connect => yes
sanitysql => select count(*) from systables
;
; Many databases have a default of '\' to escape special characters. MS SQL
; Server does not.
backslash_is_escape => no

9
res/res_odbc.c
View File

@@ -262,6 +262,10 @@ static int load_odbc_config(void)
if (!strcasecmp(v->name, "pooling")) {
if (ast_true(v->value))
pooling = 1;
} else if (!strncasecmp(v->name, "share", 5)) {
/* "shareconnections" is a little clearer in meaning than "pooling" */
if (ast_false(v->value))
pooling = 1;
} else if (!strcasecmp(v->name, "limit")) {
sscanf(v->value, "%d", &limit);
if (ast_true(v->value) && !limit) {
@@ -633,6 +637,11 @@ static int reload(void)
bse = 1;
for (v = ast_variable_browse(config, cat); v; v = v->next) {
if (!strcasecmp(v->name, "pooling")) {
if (ast_true(v->value))
pooling = 1;
} else if (!strncasecmp(v->name, "share", 5)) {
/* "shareconnections" is a little clearer in meaning than "pooling" */
if (ast_false(v->value))
pooling = 1;
} else if (!strcasecmp(v->name, "limit")) {
sscanf(v->value, "%d", &limit);