Skip to content

Allow for pbc socket keepalive settings #441

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
aquam8 wants to merge 2 commits into from
Closed

Allow for pbc socket keepalive settings #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4e111e
adding keepalive options to pbc transport connection socket
Dec 11, 2015
b68f3a6
Merge remote-tracking branch 'upstream/master'
aquam8 Jan 19, 2016
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: 8 additions & 0 deletions riak/transports/pbc/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,12 @@ def _connect(self):
self._timeout)
else:
self._socket = socket.create_connection(self._address)
if self._socket_keepalive:
self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
ka_opts = self._socket_keepalive_options or {}
for k, v in ka_opts.iteritems():
self._socket.setsockopt(socket.SOL_TCP, k, v)

if self._client._credentials:
self._init_security()

Expand Down Expand Up @@ -231,3 +237,5 @@ def _parse_msg(self, code, packet):
# These are set in the RiakPbcTransport initializer
_address = None
_timeout = None
_socket_keepalive = None
_socket_keepalive_options = None
4 changes: 4 additions & 0 deletions riak/transports/pbc/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ def __init__(self,
node=None,
client=None,
timeout=None,
socket_keepalive=False,
socket_keepalive_options=None,
*unused_options):
"""
Construct a new RiakPbcTransport object.
Expand All @@ -39,6 +41,8 @@ def __init__(self,
self._address = (node.host, node.pb_port)
self._timeout = timeout
self._socket = None
self._socket_keepalive = socket_keepalive
self._socket_keepalive_options = socket_keepalive_options

# FeatureDetection API
def _server_version(self):
Expand Down