Skip to content
Merged
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions lib/tds/protocol.ex
Original file line number Diff line number Diff line change
Expand Up @@ -364,19 +364,22 @@ defmodule Tds.Protocol do
s = %{s | opts: opts}

# Initalize TCP connection with the SQL Server
with {:ok, sock} <- :gen_tcp.connect(host, port, sock_opts, timeout),
{:ok, buffers} <- :inet.getopts(sock, [:sndbuf, :recbuf, :buffer]),
:ok <- :inet.setopts(sock, buffer: max_buf_size(buffers)) do
# Send Prelogin message to SQL Server
case send_prelogin(%{s | sock: {:gen_tcp, sock}}) do
{:error, error, _state} ->
:gen_tcp.close(sock)
{:error, error}

other ->
other
end
else
case :gen_tcp.connect(host, port, sock_opts, timeout) do
{:ok, sock} ->
with {:ok, buffers} <- :inet.getopts(sock, [:sndbuf, :recbuf, :buffer]),
:ok <- :inet.setopts(sock, buffer: max_buf_size(buffers)),
{:ok, s} <- send_prelogin(%{s | sock: {:gen_tcp, sock}}) do
{:ok, s}
else
{:disconnect, exception, _state} ->
:gen_tcp.close(sock)
{:error, exception}

{:error, error} ->
:gen_tcp.close(sock)
{:error, %Tds.Error{message: "tcp connect: #{error}"}}
end

{:error, error} ->
{:error, %Tds.Error{message: "tcp connect: #{error}"}}
end
Expand Down Expand Up @@ -851,9 +854,6 @@ defmodule Tds.Protocol do
buffer
|> IO.iodata_to_binary()
|> decode(s)
else
{:disconnect, _ex, _s} = res -> {0, res}
other -> other
end
end

Expand Down