dbg: test-output for pinging

diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java
index deb5215adda8b1391ab5772921a2cee5951c71e0..7243a3ebde0a3785b6b497cfe260c55d81eda05b 100644 (file)
--- 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 962d874b1c5c2b45b93de31a22791e60ddc0aa46..5ad0d185d62414c3ccb2a86ed4ae8bb14f1bfcd5 100644 (file)
--- 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":