Merge pull request #5 from findmypast-oss/genserver_timeout

Adding query timeout to the ODBC Genserver.call
findmypast-oss · Apr 28, 2017 · 5ac75cd · 5ac75cd
2 parents 0f20de1 + a02a2cc
commit 5ac75cd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/mssqlex/odbc.ex b/lib/mssqlex/odbc.ex
@@ -46,7 +46,8 @@ defmodule Mssqlex.ODBC do
   def query(pid, statement, params) do
     if Process.alive?(pid) do
       GenServer.call(pid,
-        {:query, %{statement: IO.iodata_to_binary(statement), params: params}})
+        {:query, %{statement: IO.iodata_to_binary(statement), params: params}},
+        Keyword.get(params, :timeout, 5000))
     else
       {:error, %Mssqlex.Error{message: :no_connection}}
     end