X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Fping%2FDNSPinger.java;h=a7c74bd2271f56587abf777e1ebb8e57ae873f49;hp=aeb41e5f7418db1608676199e7383f0975201f35;hb=7b709637bb12efc4a593a5ca6f312ed27566dad4;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e diff --git a/src/club/wpia/gigi/ping/DNSPinger.java b/src/club/wpia/gigi/ping/DNSPinger.java index aeb41e5f..a7c74bd2 100644 --- a/src/club/wpia/gigi/ping/DNSPinger.java +++ b/src/club/wpia/gigi/ping/DNSPinger.java @@ -7,20 +7,21 @@ import javax.naming.NamingException; 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.util.DNSUtil; import club.wpia.gigi.util.SystemKeywords; public class DNSPinger extends DomainPinger { @Override - public void ping(Domain domain, String expToken, CertificateOwner u, int confId) { + public DomainPingExecution ping(Domain domain, String expToken, CertificateOwner u, DomainPingConfiguration conf) { String[] tokenParts = expToken.split(":", 2); List nameservers; try { nameservers = Arrays.asList(DNSUtil.getNSNames(domain.getSuffix())); } catch (NamingException e) { - enterPingResult(confId, "error", "No authorative nameserver found.", null); - return; + return enterPingResult(conf, "error", "No authorative nameserver found.", null); } StringBuffer result = new StringBuffer(); result.append("failed: "); @@ -51,9 +52,9 @@ public class DNSPinger extends DomainPinger { } if ( !failed) { - enterPingResult(confId, PING_SUCCEDED, "", null); + return enterPingResult(conf, PING_SUCCEDED, "", null); } else { - enterPingResult(confId, "error", result.toString(), null); + return enterPingResult(conf, "error", result.toString(), null); } } }