tdlight-team/tdlight-java
tdlight-team/tdlight-java
1
2
Fork 0
Code Issues Releases Wiki Activity

Ignore aborted requests errors

Browse Source
This commit is contained in:
Andrea Cavalli 2021-10-02 16:28:44 +02:00
parent 19d3a845ef
commit 2f50d407d7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/it/tdlight/common/internal/InternalReactiveClient.java
View File

@ -23,9 +23,12 @@ import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription; import org.reactivestreams.Subscription;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
public final class InternalReactiveClient implements ClientEventsHandler, ReactiveTelegramClient { public final class InternalReactiveClient implements ClientEventsHandler, ReactiveTelegramClient {
private static final Marker TG_MARKER = MarkerFactory.getMarker("TG");
private static final Logger logger = LoggerFactory.getLogger(InternalReactiveClient.class); private static final Logger logger = LoggerFactory.getLogger(InternalReactiveClient.class);
private final ConcurrentHashMap<Long, Handler> handlers = new ConcurrentHashMap<>(); private final ConcurrentHashMap<Long, Handler> handlers = new ConcurrentHashMap<>();
private final ScheduledExecutorService timers = Executors.newSingleThreadScheduledExecutor(); private final ScheduledExecutorService timers = Executors.newSingleThreadScheduledExecutor();
@ -94,16 +97,22 @@ public final class InternalReactiveClient implements ClientEventsHandler, Reacti
if (handler != null) { if (handler != null) {
try { try {
if (eventId == 0) { if (eventId == 0) {
logger.trace("Client {} received an event: {}", clientId, event); logger.trace(TG_MARKER, "Client {} received an event: {}", clientId, event);
} else { } else {
logger.trace("Client {} received a response for query id {}: {}", clientId, eventId, event); logger.trace(TG_MARKER, "Client {} received a response for query id {}: {}", clientId, eventId, event);
} }
handler.getResultHandler().onResult(event); handler.getResultHandler().onResult(event);
} catch (Throwable cause) { } catch (Throwable cause) {
handleException(handler.getExceptionHandler(), cause); handleException(handler.getExceptionHandler(), cause);
} }
} else { } else {
logger.error("Unknown event id \"{}\", the event has been dropped! {}", eventId, event); if (event.getConstructor() == Error.CONSTRUCTOR) {
TdApi.Error error = (TdApi.Error) event;
if (error.code == 500 && "Request aborted".equals(error.message)) {
return;
}
}
logger.error(TG_MARKER, "Unknown event id \"{}\", the event has been dropped! {}", eventId, event);
} }
} }