Skip to content

Fix EU event-log fallback to query EU host #16

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
winrid merged 1 commit into from
Jul 10, 2026
Merged

Fix EU event-log fallback to query EU host #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions pubsub/src/main/java/com/fastcomments/pubsub/LiveEventSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public void onOpen(WebSocket webSocket, Response response) {

// Fetch missed events if we have a last event time
if (lastEventTime > 0) {
fetchEventLog(tenantId, urlId, userIdWS, lastEventTime, new Date().getTime(),
fetchEventLog(config.region, tenantId, urlId, userIdWS, lastEventTime, new Date().getTime(),
events -> processEvents(events, canSeeCommentsCallback, handleLiveEvent));
}

Expand Down Expand Up @@ -253,7 +253,7 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {

// Fetch missed events if we have a last event time
if (lastEventTime > 0) {
fetchEventLog(tenantId, urlId, userIdWS, lastEventTime, new Date().getTime(),
fetchEventLog(config.region, tenantId, urlId, userIdWS, lastEventTime, new Date().getTime(),
events -> processEvents(events, canSeeCommentsCallback, handleLiveEvent));
}
}
Expand Down Expand Up @@ -323,6 +323,7 @@ public void run() {
* Fetch event log from API using PublicApi client
*/
private static void fetchEventLog(
String region,
String tenantId,
String urlId,
String userIdWS,
Expand All @@ -331,8 +332,13 @@ private static void fetchEventLog(
Consumer<List<LiveEvent>> callback
) {
try {
// Create PublicApi instance with its own HTTP client
PublicApi publicApi = new PublicApi(new ApiClient(httpClient));
// Create PublicApi instance with its own HTTP client, pointed at the region's host
// so the "fetch missed events" fallback queries EU infra for EU tenants instead of US.
ApiClient apiClient = new ApiClient(httpClient);
if (Objects.equals(region, "eu")) {
apiClient.setBasePath("https://eu.fastcomments.com");
}
PublicApi publicApi = new PublicApi(apiClient);

// Create API request
PublicApi.APIgetEventLogRequest request =
Expand Down
Loading