fix: correct SQL query for issuing repings.

[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 397ad58b508350c56028db1469db32af54cd0105..a8d90f9c784398dbc9fd8969b1afe786aa4be8f3 100644 (file)
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -38,7 +38,15 @@ public class PingerDaemon extends Thread {
     }
 
     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`");
+        searchNeededPings = new GigiPreparedStatement("SELECT  `pc`.`id`" //
+                + " FROM  `pingconfig` AS `pc`" //
+                + " INNER JOIN `domains` AS `d` ON `pc`.`domainid` = `d`.`id`" //
+                + " LEFT JOIN `domainPinglog` AS `dpl` ON `pc`.`id` = `dpl`.`configId`" //
+                + " WHERE  `pc`.`deleted` IS NULL" //
+                + " AND  `d`.`deleted` IS NULL" //
+                + " GROUP BY `pc`.`id`"//
+                + " HAVING  ( MAX(`dpl`.`when`) < CURRENT_TIMESTAMP - interval '6 mons')" //
+                + " OR  COUNT(`dpl`.`configId`) < 1");
         pingers.put(DomainPingType.EMAIL, new EmailPinger());
         pingers.put(DomainPingType.SSL, new SSLPinger(truststore));
         pingers.put(DomainPingType.HTTP, new HTTPFetch());