lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timeout

Browse Source
This commit is contained in:
redkale
2024-01-22 22:37:47 +08:00
parent 70fe0fde1e
commit 257b406d73
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/redkale/net/AsyncIOGroup.java
View File

@@ -237,9 +237,7 @@ public class AsyncIOGroup extends AsyncGroup {
} catch (IOException e) { } catch (IOException e) {
return CompletableFuture.failedFuture(e); return CompletableFuture.failedFuture(e);
} }
int seconds = connectTimeoutSeconds > 0 ? connectTimeoutSeconds : 6; final CompletableFuture future = new CompletableFuture();
final Supplier<String> timeoutMsg = () -> address + " connect timeout";
final CompletableFuture future = Utility.orTimeout(new CompletableFuture(), timeoutMsg, seconds, TimeUnit.SECONDS);
conn.connect(address, null, new CompletionHandler<Void, Void>() { conn.connect(address, null, new CompletionHandler<Void, Void>() {
@Override @Override
public void completed(Void result, Void attachment) { public void completed(Void result, Void attachment) {
@@ -265,7 +263,9 @@ public class AsyncIOGroup extends AsyncGroup {
future.completeExceptionally(exc); future.completeExceptionally(exc);
} }
}); });
return Utility.orTimeout(future, timeoutMsg, 30, TimeUnit.SECONDS); int seconds = connectTimeoutSeconds > 0 ? connectTimeoutSeconds : 6;
final Supplier<String> timeoutMsg = () -> address + " tcp-connect timeout";
return Utility.orTimeout(future, timeoutMsg, seconds, TimeUnit.SECONDS);
} }
//创建一个AsyncConnection对象，只给测试代码使用 //创建一个AsyncConnection对象，只给测试代码使用

4
src/main/java/org/redkale/net/client/Client.java
View File

@@ -388,9 +388,9 @@ public abstract class Client<C extends ClientConnection<R, P>, R extends ClientR
}); });
} else { } else {
int seconds = connectTimeoutSeconds > 0 ? connectTimeoutSeconds : 6; int seconds = connectTimeoutSeconds > 0 ? connectTimeoutSeconds : 6;
CompletableFuture rs = Utility.orTimeout(new CompletableFuture(), () -> addr + " connect timeout", seconds, TimeUnit.SECONDS); CompletableFuture rs = new CompletableFuture();
waitQueue.offer(rs); waitQueue.offer(rs);
return rs; return Utility.orTimeout(rs, () -> addr + " connect timeout", seconds, TimeUnit.SECONDS);
} }
} }