configure rate limit

Author: pidoubleyou

dist/mserver.xml

@@ -31,6 +31,7 @@
     <system-proxy-port></system-proxy-port>
     <system-debug>1</system-debug>
     <sr-rate-limit>1.0</sr-rate-limit>
+    <arte-rate-limit>6.0</arte-rate-limit>
 </system>
 
 

src/main/java/mServer/crawler/sender/arte/tasks/ArteRateLimitedJsonRestTask.java

@@ -5,13 +5,14 @@
 import mServer.crawler.sender.MediathekReader;
 import mServer.crawler.sender.base.AbstractJsonRestTask;
 import mServer.crawler.sender.base.CrawlerUrlDTO;
+import mServer.tool.MserverDaten;
 
 import java.util.Optional;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 public abstract class ArteRateLimitedJsonRestTask<T, R, D extends CrawlerUrlDTO> extends AbstractJsonRestTask<T, R, D> {
   private static final long serialVersionUID = 1L;
-  private static final RateLimiter rateLimiter = RateLimiter.create(6.0);
+  private static final RateLimiter rateLimiter = RateLimiter.create(MserverDaten.getArteRateLimit());
 
   protected ArteRateLimitedJsonRestTask(MediathekReader aCrawler, ConcurrentLinkedQueue<D> urlToCrawlDTOs, Optional<String> authKey) {
     super(aCrawler, urlToCrawlDTOs, authKey);

src/main/java/mServer/tool/MserverDaten.java

@@ -77,6 +77,22 @@ public static double getSrRateLimit() {
     }
   }
 
+  public static double getArteRateLimit() {
+    String rateLimitValue = system[MserverKonstanten.SYSTEM_ARTE_RATELIMIT_NR];
+    if (rateLimitValue == null || rateLimitValue.trim().equals("")) {
+      return 6.0;
+    }
+
+    try {
+      double rateLimit = Double.parseDouble(system[MserverKonstanten.SYSTEM_ARTE_RATELIMIT_NR].trim());
+      MserverLog.systemMeldung("ARTE rate limit: " + Double.toString(rateLimit));
+      return rateLimit;
+    } catch (NumberFormatException ignored) {
+      MserverLog.fehlerMeldung(963487218, MserverDaten.class.getName(), new String[]{"ARTE rate limit falsch: ", system[MserverKonstanten.SYSTEM_ARTE_RATELIMIT_NR]});
+      return 6.0;
+    }
+  }
+
   public static void setBasisVerzeichnis(String b) {
     if (b.isEmpty()) {
       basisverzeichnis = getBasisVerzeichnis(b, true);

src/main/java/mServer/tool/MserverKonstanten.java

@@ -87,18 +87,20 @@ public class MserverKonstanten {
   public static final int SYSTEM_RESTART_AFTER_RUN_NR = 14;
   public static final String SYSTEM_SR_RATELIMIT_RUN = "sr-rate-limit";
   public static final int SYSTEM_SR_RATELIMIT_NR = 15;
-  
+  public static final String SYSTEM_ARTE_RATELIMIT_RUN = "arte-rate-limit";
+  public static final int SYSTEM_ARTE_RATELIMIT_NR = 16;
+
   public static final String SYSTEM_BANNEDFILMLIST = "system-bannedFilmList";
-  public static final int SYSTEM_BANNEDFILMLIST_NR = 16;
+  public static final int SYSTEM_BANNEDFILMLIST_NR = 17;
 
   public static final String SYSTEM_CRAWLER_LIST = "system-crawler-list";
-  public static final int SYSTEM_CRAWLER_LIST_NR = 17;
+  public static final int SYSTEM_CRAWLER_LIST_NR = 18;
 
   public static final String[] SYSTEM_COLUMN_NAMES = {
     SYSTEM_USER_AGENT, SYSTEM_IMPORT_URL_1, SYSTEM_IMPORT_URL_2, SYSTEM_IMPORT_OLD,
     SYSTEM_IMPORT_AKT, SYSTEM_EXPORT_AKT, SYSTEM_IMPORT_LIVE,
     SYSTEM_EXPORT_FILMLISTE_AKT, SYSTEM_EXPORT_FILMLISTE_ORG, SYSTEM_EXPORT_FILMLISTE_DIFF, SYSTEM_FILMLISTE_ORG,
-    SYSTEM_PROXY_URL, SYSTEM_PROXY_PORT, SYSTEM_DEBUG, SYSTEM_RESTART_AFTER_RUN, SYSTEM_SR_RATELIMIT_RUN, SYSTEM_BANNEDFILMLIST, SYSTEM_CRAWLER_LIST
+    SYSTEM_PROXY_URL, SYSTEM_PROXY_PORT, SYSTEM_DEBUG, SYSTEM_RESTART_AFTER_RUN, SYSTEM_SR_RATELIMIT_RUN, SYSTEM_ARTE_RATELIMIT_RUN, SYSTEM_BANNEDFILMLIST, SYSTEM_CRAWLER_LIST
   };
 
   public static final int SYSTEM_MAX_ELEM = SYSTEM_COLUMN_NAMES.length;