UPD: Factor out PingConfig objects and pingconfig-form.

[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 cd36dc6681d7063744bb12a302fdd3db8c57bd94..806f7c7615d4499d761a1eb4b3067002279f1d1e 100644 (file)
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -5,9 +5,10 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.DomainPingConfiguration;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.util.RandomToken;
 
 public class PingerDaemon extends Thread {
@@ -27,7 +28,7 @@ public class PingerDaemon extends Thread {
     @Override
     public void run() {
         try {
-            searchNeededPings = DatabaseConnection.getInstance().prepare("SELECT pingconfig.*, domains.domain, domains.memid FROM pingconfig LEFT JOIN domainPinglog ON domainPinglog.configId=pingconfig.id INNER JOIN domains ON domains.id=pingconfig.domainid WHERE domainPinglog.configId IS NULL ");
+            searchNeededPings = DatabaseConnection.getInstance().prepare("SELECT pingconfig.*, domains.domain, domains.memid 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 ");
             enterPingResult = DatabaseConnection.getInstance().prepare("INSERT INTO domainPinglog SET configId=?, state=?, result=?, challenge=?");
             pingers.put("email", new EmailPinger());
             pingers.put("ssl", new SSLPinger(truststore));
@@ -45,7 +46,6 @@ public class PingerDaemon extends Thread {
             try {
                 Thread.sleep(5000);
             } catch (InterruptedException e) {
-                e.printStackTrace();
             }
         }
     }
@@ -72,4 +72,6 @@ public class PingerDaemon extends Thread {
             }
         }
     }
+
+    public void requestReping(DomainPingConfiguration dpc) {}
 }