upd: cleanup SQL statements

[gigi.git] / src / club / wpia / gigi / ping / PingerDaemon.java

diff --git a/src/club/wpia/gigi/ping/PingerDaemon.java b/src/club/wpia/gigi/ping/PingerDaemon.java
index 1cd48cf17f6158a42428c4f80c0d47973a91b88f..51cc985838b23cd318274e4dcdddbbefcf13ca86 100644 (file)
--- a/src/club/wpia/gigi/ping/PingerDaemon.java
+++ b/src/club/wpia/gigi/ping/PingerDaemon.java
@@ -6,9 +6,9 @@ import java.util.LinkedList;
 import java.util.Queue;
 
 import club.wpia.gigi.database.DatabaseConnection;
+import club.wpia.gigi.database.DatabaseConnection.Link;
 import club.wpia.gigi.database.GigiPreparedStatement;
 import club.wpia.gigi.database.GigiResultSet;
-import club.wpia.gigi.database.DatabaseConnection.Link;
 import club.wpia.gigi.dbObjects.Domain;
 import club.wpia.gigi.dbObjects.DomainPingConfiguration;
 import club.wpia.gigi.dbObjects.DomainPingType;
@@ -18,8 +18,6 @@ public class PingerDaemon extends Thread {
 
     HashMap<DomainPingType, DomainPinger> pingers = new HashMap<>();
 
-    private GigiPreparedStatement searchNeededPings;
-
     private KeyStore truststore;
 
     private Queue<DomainPingConfiguration> toExecute = new LinkedList<>();
@@ -38,15 +36,7 @@ public class PingerDaemon extends Thread {
     }
 
     public void runWithConnection() {
-        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());
@@ -64,11 +54,21 @@ public class PingerDaemon extends Thread {
                     }
                     notifyAll();
                 }
+                try (GigiPreparedStatement 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')")) {
 
-                GigiResultSet rs = searchNeededPings.executeQuery();
-                while (rs.next()) {
-                    worked = true;
-                    handle(DomainPingConfiguration.getById(rs.getInt("id")));
+                    GigiResultSet rs = searchNeededPings.executeQuery();
+                    while (rs.next()) {
+                        worked = true;
+                        handle(DomainPingConfiguration.getById(rs.getInt("id")));
+                    }
                 }
                 try {
                     if ( !worked) {