Skip to content

Close sockets when option setup fails #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
OskarEichler wants to merge 1 commit into from
Closed

Close sockets when option setup fails #318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lib/redis_client/ruby_connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def connect
socket = if @config.path
UNIXSocket.new(@config.path)
else
sock = if SUPPORTS_RESOLV_TIMEOUT
socket = if SUPPORTS_RESOLV_TIMEOUT
begin
Socket.tcp(@config.host, @config.port, connect_timeout: @connect_timeout, resolv_timeout: @connect_timeout)
rescue Errno::ETIMEDOUT => timeout_error
Expand All @@ -128,9 +128,9 @@ def connect
Socket.tcp(@config.host, @config.port, connect_timeout: @connect_timeout)
end
# disables Nagle's Algorithm, prevents multiple round trips with MULTI
sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
enable_socket_keep_alive(sock)
sock
socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
enable_socket_keep_alive(socket)
socket
end

if @config.ssl
Expand Down
Loading