]> granicus.if.org Git - ejabberd/commitdiff
Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266)
authorJerome Sautret <jerome.sautret@process-one.net>
Tue, 28 Feb 2017 11:19:07 +0000 (12:19 +0100)
committerJerome Sautret <jerome.sautret@process-one.net>
Tue, 28 Feb 2017 11:19:07 +0000 (12:19 +0100)
src/ejabberd_sql.erl

index 46dd682979c0addce4828af2419538859c100b5a..51ff9d436b72342840a8455e5d47f34ac9cd368c 100644 (file)
@@ -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(),