From 12a910cd22e51e077c1192b200149811e3d82eab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 17 Jun 2016 17:37:02 +0200 Subject: [PATCH] upd: factor out ping-delay for domains to constant Change-Id: Ib7dba946ea9e9d7741c11fe6fb1c143d91e92c72 --- .../cacert/gigi/dbObjects/DomainPingConfiguration.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java index baa7b7b0..d63aff9b 100644 --- a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java +++ b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java @@ -14,6 +14,8 @@ import org.cacert.gigi.output.template.SprintfCommand; public class DomainPingConfiguration implements IdCachable { + private static final int REPING_MINIMUM_DELAY = 5 * 60 * 1000; + private int id; private Domain target; @@ -88,12 +90,13 @@ public class DomainPingConfiguration implements IdCachable { public synchronized void requestReping() throws GigiApiException { Date lastExecution = getLastExecution(); - if (lastExecution.getTime() + 5 * 60 * 1000 < System.currentTimeMillis()) { + if (lastExecution.getTime() + REPING_MINIMUM_DELAY < System.currentTimeMillis()) { Gigi.notifyPinger(this); return; } Map data = new HashMap(); - 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 {0}.", Arrays.asList("${data}")), data)); + data.put("delay", REPING_MINIMUM_DELAY / 60 / 1000); + data.put("data", new Date(lastExecution.getTime() + REPING_MINIMUM_DELAY)); + throw new GigiApiException(new Scope(new SprintfCommand("Reping is only allowed after {0} minutes, yours end at {1}.", Arrays.asList("${delay}", "${data}")), data)); } } -- 2.39.2