X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FDomainPinger.java;h=c5eb3926bea8d8a2fed6b0b766b11171d9a13ae0;hb=a61a2d320cc2bb730528832133a8220cb5b80d68;hp=942334920fc0432b434913379b0cb641959046e2;hpb=aa5723dbb64ec8efa63909d39ff72364f0a5ee96;p=gigi.git diff --git a/src/org/cacert/gigi/ping/DomainPinger.java b/src/org/cacert/gigi/ping/DomainPinger.java index 94233492..c5eb3926 100644 --- a/src/org/cacert/gigi/ping/DomainPinger.java +++ b/src/org/cacert/gigi/ping/DomainPinger.java @@ -1,11 +1,21 @@ package org.cacert.gigi.ping; +import org.cacert.gigi.database.DBEnum; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.dbObjects.CertificateOwner; import org.cacert.gigi.dbObjects.Domain; public abstract class DomainPinger { + public static enum PingState implements DBEnum { + OPEN, SUCCESS, FAILED; + + @Override + public String getDBName() { + return toString().toLowerCase(); + } + } + public static final String PING_STILL_PENDING = null; public static final String PING_SUCCEDED = ""; @@ -13,14 +23,14 @@ public abstract class DomainPinger { public abstract void ping(Domain domain, String configuration, CertificateOwner target, int confId); protected static void enterPingResult(int configId, String state, String result, String token) { + PingState estate = DomainPinger.PING_STILL_PENDING == state ? PingState.OPEN : DomainPinger.PING_SUCCEDED.equals(state) ? PingState.SUCCESS : PingState.FAILED; try (GigiPreparedStatement enterPingResult = new GigiPreparedStatement("INSERT INTO `domainPinglog` SET `configId`=?, `state`=?::`pingState`, `result`=?, `challenge`=?")) { enterPingResult.setInt(1, configId); - enterPingResult.setString(2, DomainPinger.PING_STILL_PENDING == state ? "open" : DomainPinger.PING_SUCCEDED.equals(state) ? "success" : "failed"); + enterPingResult.setEnum(2, estate); enterPingResult.setString(3, result); enterPingResult.setString(4, token); enterPingResult.execute(); } - } protected static void updatePingResult(int configId, String state, String result, String token) { @@ -31,6 +41,6 @@ public abstract class DomainPinger { updatePingResult.setString(4, token); updatePingResult.execute(); } - } + }