import java.util.LinkedList;
import java.util.Queue;
-import org.cacert.gigi.database.DatabaseConnection;
import org.cacert.gigi.database.GigiPreparedStatement;
import org.cacert.gigi.database.GigiResultSet;
import org.cacert.gigi.dbObjects.Domain;
import org.cacert.gigi.dbObjects.DomainPingConfiguration;
-import org.cacert.gigi.dbObjects.DomainPingConfiguration.PingType;
+import org.cacert.gigi.dbObjects.DomainPingType;
import org.cacert.gigi.util.RandomToken;
public class PingerDaemon extends Thread {
- HashMap<PingType, DomainPinger> pingers = new HashMap<>();
+ HashMap<DomainPingType, DomainPinger> pingers = new HashMap<>();
private GigiPreparedStatement searchNeededPings;
@Override
public void run() {
- searchNeededPings = DatabaseConnection.getInstance().prepare("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) AND `domains`.`deleted` IS NULL GROUP BY `pingconfig`.`id`");
- pingers.put(PingType.EMAIL, new EmailPinger());
- pingers.put(PingType.SSL, new SSLPinger(truststore));
- pingers.put(PingType.HTTP, new HTTPFetch());
- pingers.put(PingType.DNS, new DNSPinger());
+ 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`");
+ pingers.put(DomainPingType.EMAIL, new EmailPinger());
+ pingers.put(DomainPingType.SSL, new SSLPinger(truststore));
+ pingers.put(DomainPingType.HTTP, new HTTPFetch());
+ pingers.put(DomainPingType.DNS, new DNSPinger());
while (true) {
try {
}
private void handle(DomainPingConfiguration conf) {
- PingType type = conf.getType();
+ DomainPingType type = conf.getType();
String config = conf.getInfo();
DomainPinger dp = pingers.get(type);
if (dp != null) {
try {
dp.ping(target, config, target.getOwner(), conf.getId());
} catch (Throwable t) {
+ t.printStackTrace();
DomainPinger.enterPingResult(conf.getId(), "error", "exception", null);
}
System.err.println("done (" + System.currentTimeMillis() + ")");