X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FPingerDaemon.java;fp=src%2Forg%2Fcacert%2Fgigi%2Fping%2FPingerDaemon.java;h=0e4e3bd39df9c4ba216d729c84c066668d5a8645;hp=a8d90f9c784398dbc9fd8969b1afe786aa4be8f3;hb=1473ab8375d4fea142ec06facee786c598a8de68;hpb=ee5851acf052517a45ba7f40acb409a3b3c3fa42

diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java
index a8d90f9c..0e4e3bd3 100644
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -38,15 +38,15 @@ public class PingerDaemon extends Thread {
     }
 
     public void runWithConnection() {
-        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");
+        searchNeededPings = new GigiPreparedStatement("SELECT `pc`.`id`" //
+                + " FROM `pingconfig` AS `pc`" //
+                + " INNER JOIN `domains` AS `d` ON `d`.`id` = `pc`.`domainid`" //
+                + " WHERE `d`.`deleted` IS NULL" //
+                + "  AND `pc`.`deleted` IS NULL" //
+                + "  AND NOT EXISTS (" //
+                + "    SELECT 1 FROM `domainPinglog` AS `dpl`" //
+                + "    WHERE `dpl`.`configId` = `pc`.`id`" //
+                + "     AND `dpl`.`when` >= CURRENT_TIMESTAMP - interval '6 mons')");
         pingers.put(DomainPingType.EMAIL, new EmailPinger());
         pingers.put(DomainPingType.SSL, new SSLPinger(truststore));
         pingers.put(DomainPingType.HTTP, new HTTPFetch());