Merge "Suggestions to enhance the SQL call pattern."

[gigi.git] / src / org / cacert / gigi / ping / DNSPinger.java

diff --git a/src/org/cacert/gigi/ping/DNSPinger.java b/src/org/cacert/gigi/ping/DNSPinger.java
index b1053c0e7f5b9d6beb51187235c3891b6914714f..eb6327b3f9a2968cd98332091b01bdbdf3a49d56 100644 (file)
--- a/src/org/cacert/gigi/ping/DNSPinger.java
+++ b/src/org/cacert/gigi/ping/DNSPinger.java
@@ -5,20 +5,21 @@ import java.util.List;
 
 import javax.naming.NamingException;
 
+import org.cacert.gigi.dbObjects.CertificateOwner;
 import org.cacert.gigi.dbObjects.Domain;
-import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.util.DNSUtil;
 
 public class DNSPinger extends DomainPinger {
 
     @Override
-    public String ping(Domain domain, String expToken, User u) {
+    public void ping(Domain domain, String expToken, CertificateOwner u, int confId) {
         String[] tokenParts = expToken.split(":", 2);
         List<String> nameservers;
         try {
             nameservers = Arrays.asList(DNSUtil.getNSNames(domain.getSuffix()));
         } catch (NamingException e) {
-            return "No authorative nameserver found.";
+            enterPingResult(confId, "error", "No authorative nameserver found.", null);
+            return;
         }
         StringBuffer result = new StringBuffer();
         result.append("failed: ");
@@ -49,8 +50,9 @@ public class DNSPinger extends DomainPinger {
 
         }
         if ( !failed) {
-            return PING_SUCCEDED;
+            enterPingResult(confId, PING_SUCCEDED, "", null);
+        } else {
+            enterPingResult(confId, "error", result.toString(), null);
         }
-        return result.toString();
     }
 }