Skip to content

Fix apparent connection resets due to SSL socket errors #54

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

Open
arjun810 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix apparent connection resets due to SSL socket errors #54

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fc496b
Clarify where buffer_size is used by using self.buffer_size in select…
arjun810 Jul 18, 2023
d3d710f
Fix issue with secure socket having unread data, but returning as not…
arjun810 Jul 18, 2023
248ee04
Clean up get_message & don't rely on receiving a specific number of b…
arjun810 Jul 19, 2023
cc17252
Don't check socket.pending unless using TLS
arjun810 Jul 19, 2023
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
27 changes: 13 additions & 14 deletions faktory/_proto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def is_supported_server_version(self, v: int) -> bool:

def get_message(self) -> Iterator[str]:
socket = self.socket
buffer = self.select_data(self.buffer_size)
buffer = self.select_data()
while self.is_connected or self.is_connecting:
buffering = True
while buffering:
Expand Down Expand Up @@ -271,32 +271,31 @@ def get_message(self) -> Iterator[str]:
self.log.debug("> {}".format("nil"))
yield ""
else:
if len(buffer) >= number_of_bytes:
# we've already got enough bytes in the buffer
data = buffer[:number_of_bytes]
buffer = buffer[number_of_bytes:]
else:
data = buffer
while len(data) != number_of_bytes:
bytes_required = number_of_bytes - len(data)
data += self.select_data(bytes_required)
buffer = []
while len(buffer) < number_of_bytes:
buffer += self.select_data()
data = buffer[:number_of_bytes]
buffer = buffer[number_of_bytes:]
resp = data.decode().strip("\r\n ")
if self.debug:
self.log.debug("> {}".format(resp))
yield resp
else:
more = self.select_data(self.buffer_size)
more = self.select_data()
if not more:
buffering = False
else:
buffer += more

def select_data(self, buffer_size: int):
def select_data(self):
s = self.socket
ready = select.select([s], [], [], self.timeout)
if ready[0]:
buffer = s.recv(buffer_size)
buffer = s.recv(self.buffer_size)
if self.use_tls:
unread = s.pending()
while unread:
buffer += s.recv(unread)
unread = s.pending()
if len(buffer) > 0:
return buffer
self.disconnect()
Expand Down