Skip to content

fix: Fix SSE delay reset handling #39

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
merged 3 commits into from
Feb 28, 2025
Merged

fix: Fix SSE delay reset handling #39

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aea32cc
fix: Fix SSE delay reset handling
keelerm84 Feb 28, 2025
1f248b2
Add unit test
keelerm84 Feb 28, 2025
906be34
Fix sort
keelerm84 Feb 28, 2025
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
15 changes: 11 additions & 4 deletions ld_eventsource/sse_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def __init__(

self.__connection_client = connect.create_client(logger)
self.__connection_result: Optional[ConnectionResult] = None
self.__connected_time: float = 0
self.__retry_reset_baseline: float = 0
self.__disconnected_time: float = 0

self.__closed = False
Expand Down Expand Up @@ -248,10 +248,17 @@ def next_retry_delay(self) -> float:
return self.__next_retry_delay

def _compute_next_retry_delay(self):
if self.__retry_delay_reset_threshold > 0 and self.__connected_time != 0:
connection_duration = time.time() - self.__connected_time
# If the __retry_reset_baseline is 0, then we haven't successfully connected yet.
#
# In those situations, we don't want to reset the retry delay strategy;
# it should continue to double until the retry maximum, and then hold
# steady (- jitter).
if self.__retry_delay_reset_threshold > 0 and self.__retry_reset_baseline != 0:
now = time.time()
connection_duration = now - self.__retry_reset_baseline
if connection_duration >= self.__retry_delay_reset_threshold:
self.__current_retry_delay_strategy = self.__base_retry_delay_strategy
self.__retry_reset_baseline = now
self.__next_retry_delay, self.__current_retry_delay_strategy = (
self.__current_retry_delay_strategy.apply(self.__base_retry_delay)
)
Expand Down Expand Up @@ -287,7 +294,7 @@ def _try_start(self, can_return_fault: bool) -> Optional[Fault]:
# If can_return_fault is false, it means the caller explicitly called start(), in
# which case there's no way to return a Fault so we just keep retrying transparently.
continue
self.__connected_time = time.time()
self.__retry_reset_baseline = time.time()
self.__current_error_strategy = self.__base_error_strategy
self.__interrupted = False
return None
Expand Down