From 080cf96c4b762dc2be5978492f247a92f9c22639 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Tue, 15 Sep 2015 23:32:54 +0200 Subject: [PATCH] dbg: test-output for pinging --- src/org/cacert/gigi/ping/PingerDaemon.java | 2 ++ src/org/cacert/gigi/ping/SSLPinger.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java index deb5215a..7243a3eb 100644 --- a/src/org/cacert/gigi/ping/PingerDaemon.java +++ b/src/org/cacert/gigi/ping/PingerDaemon.java @@ -80,7 +80,9 @@ public class PingerDaemon extends Thread { } enterPingResult.setInt(1, conf.getId()); Domain target = conf.getTarget(); + System.err.println("Executing " + dp + " on " + target + " (" + System.currentTimeMillis() + ")"); String resp = dp.ping(target, config, target.getOwner()); + System.err.println("done (" + System.currentTimeMillis() + ")"); enterPingResult.setString(2, DomainPinger.PING_STILL_PENDING == resp ? "open" : DomainPinger.PING_SUCCEDED.equals(resp) ? "success" : "failed"); enterPingResult.setString(3, resp); enterPingResult.setString(4, token); diff --git a/src/org/cacert/gigi/ping/SSLPinger.java b/src/org/cacert/gigi/ping/SSLPinger.java index 962d874b..5ad0d185 100644 --- a/src/org/cacert/gigi/ping/SSLPinger.java +++ b/src/org/cacert/gigi/ping/SSLPinger.java @@ -45,8 +45,9 @@ public class SSLPinger extends DomainPinger { @Override public String ping(Domain domain, String configuration, User u) { try (SocketChannel sch = SocketChannel.open()) { + sch.socket().setSoTimeout(5000); String[] parts = configuration.split(":", 2); - sch.connect(new InetSocketAddress(domain.getSuffix(), Integer.parseInt(parts[0]))); + sch.socket().connect(new InetSocketAddress(domain.getSuffix(), Integer.parseInt(parts[0])), 5000); if (parts.length == 2) { switch (parts[1]) { case "xmpp": -- 2.39.2