Merge "Suggestions to enhance the SQL call pattern."

[gigi.git] / src / org / cacert / gigi / ping / PingerDaemon.java

diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java
index e543ca1cd4dd60ed41f922aa11edf451f2ad7de7..397ad58b508350c56028db1469db32af54cd0105 100644 (file)
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -6,21 +6,20 @@ import java.util.LinkedList;
 import java.util.Queue;
 
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.database.DatabaseConnection.Link;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
-import org.cacert.gigi.dbObjects.DomainPingConfiguration.PingType;
+import org.cacert.gigi.dbObjects.DomainPingType;
 import org.cacert.gigi.util.RandomToken;
 
 public class PingerDaemon extends Thread {
 
-    HashMap<PingType, DomainPinger> pingers = new HashMap<>();
+    HashMap<DomainPingType, DomainPinger> pingers = new HashMap<>();
 
     private GigiPreparedStatement searchNeededPings;
 
-    private GigiPreparedStatement enterPingResult;
-
     private KeyStore truststore;
 
     private Queue<DomainPingConfiguration> toExecute = new LinkedList<>();
@@ -31,51 +30,69 @@ public class PingerDaemon extends Thread {
 
     @Override
     public void run() {
-        searchNeededPings = DatabaseConnection.getInstance().prepare("SELECT `pingconfig`.`id` FROM `pingconfig` LEFT JOIN `domainPinglog` ON `domainPinglog`.`configId` = `pingconfig`.`id` INNER JOIN `domains` ON `domains`.`id` = `pingconfig`.`domainid` WHERE ( `domainPinglog`.`configId` IS NULL) AND `domains`.`deleted` IS NULL GROUP BY `pingconfig`.`id`");
-        enterPingResult = DatabaseConnection.getInstance().prepare("INSERT INTO `domainPinglog` SET `configId`=?, `state`=?::`pingState`, `result`=?, `challenge`=?");
-        pingers.put(PingType.EMAIL, new EmailPinger());
-        pingers.put(PingType.SSL, new SSLPinger(truststore));
-        pingers.put(PingType.HTTP, new HTTPFetch());
-        pingers.put(PingType.DNS, new DNSPinger());
+        try (Link l = DatabaseConnection.newLink(false)) {
+            runWithConnection();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void runWithConnection() {
+        searchNeededPings = new GigiPreparedStatement("SELECT `pingconfig`.`id` FROM `pingconfig` LEFT JOIN `domainPinglog` ON `domainPinglog`.`configId` = `pingconfig`.`id` INNER JOIN `domains` ON `domains`.`id` = `pingconfig`.`domainid` WHERE ( `domainPinglog`.`configId` IS NULL OR `domainPinglog`.`when` < CURRENT_TIMESTAMP - interval '6 mons') AND `domains`.`deleted` IS NULL AND `pingconfig`.`deleted` IS NULL GROUP BY `pingconfig`.`id`");
+        pingers.put(DomainPingType.EMAIL, new EmailPinger());
+        pingers.put(DomainPingType.SSL, new SSLPinger(truststore));
+        pingers.put(DomainPingType.HTTP, new HTTPFetch());
+        pingers.put(DomainPingType.DNS, new DNSPinger());
 
         while (true) {
-            synchronized (this) {
-                DomainPingConfiguration conf;
-                while ((conf = toExecute.peek()) != null) {
-                    handle(conf);
-                    toExecute.remove();
+            try {
+                boolean worked = false;
+                synchronized (this) {
+                    DomainPingConfiguration conf;
+                    while ((conf = toExecute.peek()) != null) {
+                        worked = true;
+                        handle(conf);
+                        toExecute.remove();
+                    }
+                    notifyAll();
                 }
-                notifyAll();
-            }
 
-            GigiResultSet rs = searchNeededPings.executeQuery();
-            while (rs.next()) {
-                handle(DomainPingConfiguration.getById(rs.getInt("id")));
-            }
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException e) {
+                GigiResultSet rs = searchNeededPings.executeQuery();
+                while (rs.next()) {
+                    worked = true;
+                    handle(DomainPingConfiguration.getById(rs.getInt("id")));
+                }
+                try {
+                    if ( !worked) {
+                        Thread.sleep(5000);
+                    }
+                } catch (InterruptedException e) {
+                }
+            } catch (Throwable t) {
+                t.printStackTrace();
             }
         }
     }
 
     private void handle(DomainPingConfiguration conf) {
-        PingType type = conf.getType();
+        DomainPingType type = conf.getType();
         String config = conf.getInfo();
         DomainPinger dp = pingers.get(type);
         if (dp != null) {
-            String token = null;
             if (dp instanceof EmailPinger) {
+                String token = null;
                 token = RandomToken.generateToken(16);
                 config = config + ":" + token;
             }
-            enterPingResult.setInt(1, conf.getId());
             Domain target = conf.getTarget();
-            String resp = dp.ping(target, config, target.getOwner());
-            enterPingResult.setString(2, DomainPinger.PING_STILL_PENDING == resp ? "open" : DomainPinger.PING_SUCCEDED.equals(resp) ? "success" : "failed");
-            enterPingResult.setString(3, resp);
-            enterPingResult.setString(4, token);
-            enterPingResult.execute();
+            System.err.println("Executing " + dp + " on " + target + " (" + System.currentTimeMillis() + ")");
+            try {
+                dp.ping(target, config, target.getOwner(), conf.getId());
+            } catch (Throwable t) {
+                t.printStackTrace();
+                DomainPinger.enterPingResult(conf.getId(), "error", "exception", null);
+            }
+            System.err.println("done (" + System.currentTimeMillis() + ")");
         }
     }