summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2017-06-01 09:31:24 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-06-01 09:31:24 -0500
commit77f7c1b98f1b293f66ab4042758e138be9a5e613 (patch)
treeb17e84b26bce4970a9b18e90cd7d0f0f92557557 /configs
parentf1660745240043fae8290c5023db1b2cf327bc75 (diff)
parent44c5a144ce3194fb9cec02f42436d93853b33a86 (diff)
Merge "Sqlite3: make busy_timeout configurable."
Diffstat (limited to 'configs')
-rw-r--r--configs/samples/cdr_sqlite3_custom.conf.sample1
-rw-r--r--configs/samples/cel_sqlite3_custom.conf.sample1
-rw-r--r--configs/samples/res_config_sqlite3.conf.sample6
3 files changed, 7 insertions, 1 deletions
diff --git a/configs/samples/cdr_sqlite3_custom.conf.sample b/configs/samples/cdr_sqlite3_custom.conf.sample
index 0d5dc091c..4b88d58d4 100644
--- a/configs/samples/cdr_sqlite3_custom.conf.sample
+++ b/configs/samples/cdr_sqlite3_custom.conf.sample
@@ -5,6 +5,7 @@
;table => cdr
;columns => calldate, clid, dcontext, channel, dstchannel, lastapp, lastdata, duration, billsec, disposition, amaflags, accountcode, uniqueid, userfield, test
;values => '${CDR(start)}','${CDR(clid)}','${CDR(dcontext)}','${CDR(channel)}','${CDR(dstchannel)}','${CDR(lastapp)}','${CDR(lastdata)}','${CDR(duration)}','${CDR(billsec)}','${CDR(disposition)}','${CDR(amaflags)}','${CDR(accountcode)}','${CDR(uniqueid)}','${CDR(userfield)}','${CDR(test)}'
+;busy_timeout => 1000
;Enable High Resolution Times for billsec and duration fields
;values => '${CDR(start)}','${CDR(clid)}','${CDR(dcontext)}','${CDR(channel)}','${CDR(dstchannel)}','${CDR(lastapp)}','${CDR(lastdata)}','${CDR(duration,f)}','${CDR(billsec,f)}','${CDR(disposition)}','${CDR(amaflags)}','${CDR(accountcode)}','${CDR(uniqueid)}','${CDR(userfield)}','${CDR(test)}'
diff --git a/configs/samples/cel_sqlite3_custom.conf.sample b/configs/samples/cel_sqlite3_custom.conf.sample
index 2d9a24fc7..aa908a4f3 100644
--- a/configs/samples/cel_sqlite3_custom.conf.sample
+++ b/configs/samples/cel_sqlite3_custom.conf.sample
@@ -22,3 +22,4 @@
;table => cel
;columns => eventtype, eventtime, cidname, cidnum, cidani, cidrdnis, ciddnid, context, exten, channame, appname, appdata, amaflags, accountcode, uniqueid, userfield, peer, userdeftype, eventextra
;values => '${eventtype}','${eventtime}','${CALLERID(name)}','${CALLERID(num)}','${CALLERID(ANI)}','${CALLERID(RDNIS)}','${CALLERID(DNID)}','${CHANNEL(context)}','${CHANNEL(exten)}','${CHANNEL(channame)}','${CHANNEL(appname)}','${CHANNEL(appdata)}','${CHANNEL(amaflags)}','${CHANNEL(accountcode)}','${CHANNEL(uniqueid)}','${CHANNEL(userfield)}','${BRIDGEPEER}','${userdeftype}','${eventextra}'
+;busy_timeout => 1000 \ No newline at end of file
diff --git a/configs/samples/res_config_sqlite3.conf.sample b/configs/samples/res_config_sqlite3.conf.sample
index 5416c809e..2588b26c9 100644
--- a/configs/samples/res_config_sqlite3.conf.sample
+++ b/configs/samples/res_config_sqlite3.conf.sample
@@ -28,4 +28,8 @@
; to lock for writing.
;
;batch=1000
-
+;
+; busy timeout - timeout in miliseconds to stop waiting for locked database.
+; More info at https://www.sqlite.org/c3ref/busy_timeout.html
+;
+;busy_timeout=1000 \ No newline at end of file