Skip to content
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

[Access] Heartbeat interval not reset correctly in streaming endpoints. #6848

Merged
merged 2 commits into from
Jan 22, 2025
Merged

[Access] Heartbeat interval not reset correctly in streaming endpoints. #6848

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
d733364
Fixed hearbeat inteval reset issue
AndriiDiachuk Jan 3, 2025
1554d01
Merge branch 'master' into AndriiDiachuk/6837-hearbeat-interval-corre…
peterargue Jan 21, 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
2 changes: 1 addition & 1 deletion engine/access/rest/websockets/data_providers/account_statuses_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ func (p *AccountStatusesDataProvider) handleResponse() func(accountStatusesRespo
if blocksSinceLastMessage < p.heartbeatInterval {
return nil
}
blocksSinceLastMessage = 0
}
blocksSinceLastMessage = 0

index := messageIndex.Value()
if ok := messageIndex.Set(messageIndex.Value() + 1); !ok {
Expand Down
2 changes: 1 addition & 1 deletion engine/access/rest/websockets/data_providers/events_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ func (p *EventsDataProvider) handleResponse() func(eventsResponse *backend.Event
if blocksSinceLastMessage < p.heartbeatInterval {
return nil
}
blocksSinceLastMessage = 0
}
blocksSinceLastMessage = 0

index := messageIndex.Value()
if ok := messageIndex.Set(messageIndex.Value() + 1); !ok {
Expand Down
2 changes: 1 addition & 1 deletion engine/access/rest/websockets/legacy/websocket_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ func (wsController *WebsocketController) writeEvents(sub subscription.Subscripti
if blocksSinceLastMessage < wsController.HeartbeatInterval {
continue
}
blocksSinceLastMessage = 0
}
blocksSinceLastMessage = 0

// EventsResponse contains CCF encoded events, and this API returns JSON-CDC events.
// convert event payload formats.
Expand Down
4 changes: 2 additions & 2 deletions engine/access/state_stream/backend/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ func (h *Handler) handleEventsResponse(send sendSubscribeEventsResponseFunc, hea
if blocksSinceLastMessage < heartbeatInterval {
return nil
}
blocksSinceLastMessage = 0
}
blocksSinceLastMessage = 0

// BlockExecutionData contains CCF encoded events, and the Access API returns JSON-CDC events.
// convert event payload formats.
Expand Down Expand Up @@ -490,8 +490,8 @@ func (h *Handler) handleAccountStatusesResponse(
if blocksSinceLastMessage < heartbeatInterval {
return nil
}
blocksSinceLastMessage = 0
}
blocksSinceLastMessage = 0

results, err := convertAccountsStatusesResultsToMessage(evenVersion, resp)
if err != nil {
Expand Down
Loading