diff options
| author | Jerome Sautret <jerome.sautret@process-one.net> | 2017-02-28 12:19:07 +0100 |
|---|---|---|
| committer | Jerome Sautret <jerome.sautret@process-one.net> | 2017-02-28 12:19:07 +0100 |
| commit | d6a9ef5bc107cb5668de5c1c48a8cceac92a86c0 (patch) | |
| tree | fd34913976f2b2d2bb0aebe2e0be506ae62d2bb4 /src | |
| parent | Don't crash on malformed IP addresses (diff) | |
Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_sql.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ejabberd_sql.erl b/src/ejabberd_sql.erl index 46dd6829..51ff9d43 100644 --- a/src/ejabberd_sql.erl +++ b/src/ejabberd_sql.erl @@ -576,7 +576,8 @@ sql_query_internal(Query) -> to_odbc(odbc:sql_query(State#state.db_ref, [Query], (?TRANSACTION_TIMEOUT) - 1000)); pgsql -> - pgsql_to_odbc(pgsql:squery(State#state.db_ref, Query)); + pgsql_to_odbc(pgsql:squery(State#state.db_ref, Query, + (?TRANSACTION_TIMEOUT) - 1000)); mysql -> R = mysql_to_odbc(p1_mysql_conn:squery(State#state.db_ref, [Query], self(), |