kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1313 in FS/freeswitch from ~ANTONIO/freeswitch:bugfix/FS-10368-mod_callcenter-lock-database-errors to master 

* commit '04854fddaa1548e5d57a90fad74a433bee7a0750':
  Revert "FS-10299 [mod_callcenter] Removing global lock on all cc_execute_sql functions when executing database queries"
This commit is contained in:
Italo Rossi 2017-07-06 20:52:51 +00:00
parent 2a788cdefd 04854fddaa
commit 8ea3e3c7bc
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_callcenter/mod_callcenter.c
View File

@ -601,6 +601,8 @@ char *cc_execute_sql2str(cc_queue_t *queue, switch_mutex_t *mutex, char *sql, ch
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} else {
switch_mutex_lock(globals.mutex);
} }
if (!(dbh = cc_get_db_handle())) { if (!(dbh = cc_get_db_handle())) {
@ -615,6 +617,8 @@ end:
if (mutex) { if (mutex) {
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} else {
switch_mutex_unlock(globals.mutex);
} }
return ret; return ret;
@ -627,6 +631,8 @@ static switch_status_t cc_execute_sql(cc_queue_t *queue, char *sql, switch_mutex
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} else {
switch_mutex_lock(globals.mutex);
} }
if (!(dbh = cc_get_db_handle())) { if (!(dbh = cc_get_db_handle())) {
@ -642,6 +648,8 @@ end:
if (mutex) { if (mutex) {
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} else {
switch_mutex_unlock(globals.mutex);
} }
return status; return status;
@ -655,6 +663,8 @@ static switch_bool_t cc_execute_sql_callback(cc_queue_t *queue, switch_mutex_t *
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} else {
switch_mutex_lock(globals.mutex);
} }
if (!(dbh = cc_get_db_handle())) { if (!(dbh = cc_get_db_handle())) {
@ -675,6 +685,8 @@ end:
if (mutex) { if (mutex) {
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} else {
switch_mutex_unlock(globals.mutex);
} }
return ret; return ret;