X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FDomainPingConfiguration.java;h=baa7b7b00b69c1affad4e21391f67e425f08b01a;hb=bd738ff4450f7fabe08c4ca5bd3f7597d0b011ef;hp=e27b696d829cbc432a782546c19c5918135ad116;hpb=bf7a986282dfd7b3b77c25fe6617146fdd804f06;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
index e27b696d..baa7b7b0 100644
--- a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
+++ b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
@@ -7,7 +7,6 @@ import java.util.Map;
 
 import org.cacert.gigi.Gigi;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.output.template.Scope;
@@ -15,30 +14,27 @@ import org.cacert.gigi.output.template.SprintfCommand;
 
 public class DomainPingConfiguration implements IdCachable {
 
-    public static enum PingType {
-        EMAIL, DNS, HTTP, SSL;
-    }
-
     private int id;
 
     private Domain target;
 
-    private PingType type;
+    private DomainPingType type;
 
     private String info;
 
     private DomainPingConfiguration(int id) {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id, domainid, type, info FROM pingconfig WHERE id=?");
-        ps.setInt(1, id);
-
-        GigiResultSet rs = ps.executeQuery();
-        if ( !rs.next()) {
-            throw new IllegalArgumentException("Invalid pingconfig id " + id);
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id`, `domainid`, `type`, `info` FROM `pingconfig` WHERE `id`=?")) {
+            ps.setInt(1, id);
+
+            GigiResultSet rs = ps.executeQuery();
+            if ( !rs.next()) {
+                throw new IllegalArgumentException("Invalid pingconfig id " + id);
+            }
+            this.id = rs.getInt("id");
+            target = Domain.getById(rs.getInt("domainid"));
+            type = DomainPingType.valueOf(rs.getString("type").toUpperCase());
+            info = rs.getString("info");
         }
-        this.id = rs.getInt("id");
-        target = Domain.getById(rs.getInt("domainid"));
-        type = PingType.valueOf(rs.getString("type").toUpperCase());
-        info = rs.getString("info");
     }
 
     @Override
@@ -50,7 +46,7 @@ public class DomainPingConfiguration implements IdCachable {
         return target;
     }
 
-    public PingType getType() {
+    public DomainPingType getType() {
         return type;
     }
 
@@ -69,23 +65,25 @@ public class DomainPingConfiguration implements IdCachable {
     }
 
     public Date getLastExecution() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `when` AS stamp from domainPinglog WHERE configId=? ORDER BY `when` DESC LIMIT 1");
-        ps.setInt(1, id);
-        GigiResultSet rs = ps.executeQuery();
-        if (rs.next()) {
-            return new Date(rs.getTimestamp("stamp").getTime());
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `when` AS stamp from `domainPinglog` WHERE `configId`=? ORDER BY `when` DESC LIMIT 1")) {
+            ps.setInt(1, id);
+            GigiResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                return new Date(rs.getTimestamp("stamp").getTime());
+            }
+            return new Date(0);
         }
-        return new Date(0);
     }
 
     public Date getLastSuccess() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `when` AS stamp from domainPinglog WHERE configId=? AND state='success' ORDER BY `when` DESC LIMIT 1");
-        ps.setInt(1, id);
-        GigiResultSet rs = ps.executeQuery();
-        if (rs.next()) {
-            return new Date(rs.getTimestamp("stamp").getTime());
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `when` AS stamp from `domainPinglog` WHERE `configId`=? AND state='success' ORDER BY `when` DESC LIMIT 1")) {
+            ps.setInt(1, id);
+            GigiResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                return new Date(rs.getTimestamp("stamp").getTime());
+            }
+            return new Date(0);
         }
-        return new Date(0);
     }
 
     public synchronized void requestReping() throws GigiApiException {
@@ -96,6 +94,6 @@ public class DomainPingConfiguration implements IdCachable {
         }
         Map<String, Object> data = new HashMap<String, Object>();
         data.put("data", new Date(lastExecution.getTime() + 5 * 60 * 1000));
-        throw new GigiApiException(new Scope(new SprintfCommand("Reping is only allowed after 5 minutes, yours end at %s.", Arrays.asList("$data")), data));
+        throw new GigiApiException(new Scope(new SprintfCommand("Reping is only allowed after 5 minutes, yours end at {0}.", Arrays.asList("${data}")), data));
     }
 }