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 bc86d80c7b09de993e945870a90786326e5887c7..397ad58b508350c56028db1469db32af54cd0105 100644 (file)
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -6,16 +6,17 @@ 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;
 
@@ -29,11 +30,19 @@ 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`");
-        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) {
             try {
@@ -66,7 +75,7 @@ public class PingerDaemon extends Thread {
     }
 
     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) {
@@ -80,6 +89,7 @@ public class PingerDaemon extends Thread {
             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() + ")");