[Database] implement the stuff for requesting domain reping.

diff --git a/doc/tableStructure.sql b/doc/tableStructure.sql
index 468f2bbef35002c90abcb62fd52b9c3af417a355..9ad4d13474a831bddc1770070df2400a27349cf1 100644 (file)
--- a/doc/tableStructure.sql
+++ b/doc/tableStructure.sql
@@ -79,6 +79,7 @@ CREATE TABLE `pingconfig` (
   `domainid` int(11) NOT NULL,
   `type` enum('email', 'ssl', 'http', 'dns') NOT NULL,
   `info` varchar(255) NOT NULL,
+  `reping` enum('y','n') NOT NULL DEFAULT 'n',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index c40ee4188029918c85528acd370079d4b5a3b662..82ca12655cae358d32f00b19d47882d38d8665b1 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.dbObjects.DomainPingConfiguration;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form.CSRFException;
@@ -334,8 +333,4 @@ public class Gigi extends HttpServlet {
         instance.pinger.interrupt();
     }
 
-    public static void requestReping(DomainPingConfiguration dpc) {
-        instance.pinger.requestReping(dpc);
-    }
-
 }

diff --git a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
index 66805abeceacceceafb12b8ab7c55285184a5844..93eb363e2f9f1a57e9a6c926a459a5391a80f458 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
+++ b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
@@ -65,4 +65,14 @@ public class DomainPingConfiguration implements IdCachable {
         return res;
     }
 
+    public void requestReping() {
+        try {
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE pingconfig set reping='y' WHERE id=?");
+            ps.setInt(1, id);
+            ps.execute();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
 }

diff --git a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
index 609a1184d17053f0cb6866afce1f2fcf49ec31a9..b12eb42323f40cace4c156aa3817209b89e9ad58 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.Gigi;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
@@ -70,7 +71,9 @@ public class DomainOverview extends Page {
             if (dpc.getTarget() != d) {
                 return;
             }
-            System.out.println("Would now reping: " + dpc.getInfo());
+            dpc.requestReping();
+            Gigi.notifyPinger();
+            resp.sendRedirect(PATH + i);
         }
         if (req.getParameter("adddomain") != null) {
             DomainAddForm f = Form.getForm(req, DomainAddForm.class);

diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java
index 806f7c7615d4499d761a1eb4b3067002279f1d1e..60c1ee2eec9ae21b6a065ae33516e52e1172a79a 100644 (file)
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -7,7 +7,6 @@ import java.sql.SQLException;
 import java.util.HashMap;
 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;
 
@@ -19,6 +18,8 @@ public class PingerDaemon extends Thread {
 
     private PreparedStatement enterPingResult;
 
+    private PreparedStatement updatePingStatus;
+
     private KeyStore truststore;
 
     public PingerDaemon(KeyStore truststore) {
@@ -28,8 +29,9 @@ 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 AND domains.deleted 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 ( pingconfig.reping='y' OR domainPinglog.configId IS NULL) AND domains.deleted IS NULL GROUP BY pingconfig.id");
             enterPingResult = DatabaseConnection.getInstance().prepare("INSERT INTO domainPinglog SET configId=?, state=?, result=?, challenge=?");
+            updatePingStatus = DatabaseConnection.getInstance().prepare("UPDATE pingconfig SET reping='n' WHERE id=?");
             pingers.put("email", new EmailPinger());
             pingers.put("ssl", new SSLPinger(truststore));
             pingers.put("http", new HTTPFetch());
@@ -63,6 +65,8 @@ public class PingerDaemon extends Thread {
                     token = RandomToken.generateToken(16);
                     config = config + ":" + token;
                 }
+                updatePingStatus.setInt(1, rs.getInt("id"));
+                updatePingStatus.execute();
                 enterPingResult.setInt(1, rs.getInt("id"));
                 String resp = dp.ping(Domain.getById(rs.getInt("domainid")), config, User.getById(rs.getInt("memid")));
                 enterPingResult.setString(2, DomainPinger.PING_STILL_PENDING == resp ? "open" : DomainPinger.PING_SUCCEDED.equals(resp) ? "success" : "failed");
@@ -73,5 +77,4 @@ public class PingerDaemon extends Thread {
         }
     }
 
-    public void requestReping(DomainPingConfiguration dpc) {}
 }