Skip to content

fix: merge pr #26

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

Merged
chris-piekarski merged 9 commits into from
Feb 10, 2026
Merged

fix: merge pr #26

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7f91127
fix: address possible desync framing scenarios
chris-piekarski Feb 4, 2026
7890a84
ci: fix makefile and lint issues
chris-piekarski Feb 4, 2026
c2eb6f8
Merge branch 'master' of github.com:chris-piekarski/python-json-socket
chris-piekarski Feb 4, 2026
30f80f8
ci: actions lint error
chris-piekarski Feb 4, 2026
cf84ba5
Merge branch 'master' of github.com:chris-piekarski/python-json-socket
chris-piekarski Feb 6, 2026
9db8b78
ci: additional unit and behave coverage
chris-piekarski Feb 7, 2026
7d52b24
docs: update for dual timeout options
chris-piekarski Feb 7, 2026
9d2fd68
ci: legacy...
chris-piekarski Feb 7, 2026
1d85709
Merge branch 'master' of github.com:chris-piekarski/python-json-socket
chris-piekarski Feb 10, 2026
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
4 changes: 2 additions & 2 deletions jsocket/jsocket_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ class JsonClient(JsonSocket):
def __init__(self, address='127.0.0.1', port=5489, timeout=2.0, recv_timeout=None):
super().__init__(address, port, timeout=timeout, recv_timeout=recv_timeout)
if self.socket is not None:
self.socket.settimeout(self._timeout)
self.socket.settimeout(self._recv_timeout)

def connect(self):
"""Attempt to connect to the server up to 10 times with backoff."""
Expand All @@ -350,7 +350,7 @@ def connect(self):
# Recreate the socket to avoid retrying on a potentially bad fd.
self._close_socket()
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.socket.settimeout(self._timeout)
self.socket.settimeout(self._recv_timeout)
self.conn = self.socket
logger.debug("recreated socket for retry %d to %s:%s", attempt, self.address, self.port)
time.sleep(3)
Expand Down