andreacavalli
/
tdlib-session-container
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix

This commit is contained in:
Andrea Cavalli 2022-01-23 14:52:08 +01:00
parent 68e904681d
commit 344be2b320
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/it/tdlight/reactiveapi/AtomixReactiveApiMultiClient.java
View File

@ -7,6 +7,7 @@ import io.atomix.cluster.messaging.MessagingException;
import it.tdlight.jni.TdApi;
import it.tdlight.reactiveapi.Event.ClientBoundEvent;
import it.tdlight.reactiveapi.Event.Request;
import java.net.ConnectException;
import java.time.Duration;
import java.time.Instant;
import java.util.concurrent.CompletableFuture;
@ -60,9 +61,7 @@ public class AtomixReactiveApiMultiClient implements ReactiveApiMultiClient, Aut
}).onErrorMap(ex -> {
if (ex instanceof MessagingException.NoRemoteHandler) {
return new TdError(404, "Bot #IDU" + userId + " (live id: " + liveId + ") is not found on the cluster");
} else if (ex instanceof CompletionException && ex.getCause() instanceof TimeoutException) {
return new TdError(408, "Request Timeout", ex);
} else if (ex instanceof TimeoutException) {
} else if (ex instanceof TimeoutException || ex instanceof ConnectException) {
return new TdError(408, "Request Timeout", ex);
} else {
return ex;

9
src/main/java/it/tdlight/reactiveapi/BaseAtomixReactiveApiClient.java
View File

@ -17,6 +17,7 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.net.ConnectException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
@ -74,9 +75,7 @@ abstract class BaseAtomixReactiveApiClient implements ReactiveApiClient, AutoClo
.onErrorMap(ex -> {
if (ex instanceof MessagingException.NoRemoteHandler) {
return new TdError(404, "Bot #IDU" + this.userId + " (liveId: " + liveId + ") is not found on the cluster");
} else if (ex instanceof CompletionException && ex.getCause() instanceof TimeoutException) {
return new TdError(408, "Request Timeout", ex);
} else if (ex instanceof TimeoutException) {
} else if (ex instanceof TimeoutException || ex instanceof ConnectException) {
return new TdError(408, "Request Timeout", ex);
} else {
return ex;
@ -94,9 +93,7 @@ abstract class BaseAtomixReactiveApiClient implements ReactiveApiClient, AutoClo
.onErrorMap(ex -> {
if (ex instanceof MessagingException.NoRemoteHandler) {
return new TdError(404, "Bot #IDU" + this.userId + " is not found on the cluster");
} else if (ex instanceof CompletionException && ex.getCause() instanceof TimeoutException) {
return new TdError(408, "Request Timeout", ex);
} else if (ex instanceof TimeoutException) {
} else if (ex instanceof TimeoutException || ex instanceof ConnectException) {
return new TdError(408, "Request Timeout", ex);
} else {
return ex;