X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Fping%2FEmailPinger.java;h=7468f94a3473c68157265d8e333f0f6d0e390be9;hp=454ba81d30929a18c7f06cc852836cd77ff43052;hb=7b709637bb12efc4a593a5ca6f312ed27566dad4;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e diff --git a/src/club/wpia/gigi/ping/EmailPinger.java b/src/club/wpia/gigi/ping/EmailPinger.java index 454ba81d..7468f94a 100644 --- a/src/club/wpia/gigi/ping/EmailPinger.java +++ b/src/club/wpia/gigi/ping/EmailPinger.java @@ -5,6 +5,8 @@ import java.util.Locale; import club.wpia.gigi.dbObjects.CertificateOwner; import club.wpia.gigi.dbObjects.Domain; +import club.wpia.gigi.dbObjects.DomainPingConfiguration; +import club.wpia.gigi.dbObjects.DomainPingExecution; import club.wpia.gigi.dbObjects.User; import club.wpia.gigi.email.MailProbe; import club.wpia.gigi.localisation.Language; @@ -13,11 +15,11 @@ import club.wpia.gigi.util.RandomToken; public class EmailPinger extends DomainPinger { @Override - public void ping(Domain domain, String configuration, CertificateOwner u, int confId) { + public DomainPingExecution ping(Domain domain, String configuration, CertificateOwner u, DomainPingConfiguration conf) { String mail = configuration + "@" + domain.getSuffix(); String token = RandomToken.generateToken(16); + DomainPingExecution r = enterPingResult(conf, PING_STILL_PENDING, "", token); try { - enterPingResult(confId, PING_STILL_PENDING, "", token); Locale l = Locale.ENGLISH; if (u instanceof User) { l = ((User) u).getPreferredLocale(); @@ -26,8 +28,9 @@ public class EmailPinger extends DomainPinger { MailProbe.sendMailProbe(Language.getInstance(l), "domain", domain.getId(), token, mail); } catch (IOException e) { e.printStackTrace(); - updatePingResult(confId, "error", "Mail connection interrupted", token); + updatePingResult(conf, "error", "Mail connection interrupted", token); } + return r; } }