From a0a783c75038d55ae1501709fc324bc35df66f7c Mon Sep 17 00:00:00 2001
From: Jaimie Murdock <jaimie.murdock@gmail.com>
Date: Mon, 9 Oct 2017 16:42:32 -0400
Subject: [PATCH 1/3] oraclejdk7 EOL'd in May 2015, not supported in Travis-CI
 Trusty image

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 16244cd6..9f2b022c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@ sudo: false
 language: java
 
 jdk:
- - oraclejdk7
  - oraclejdk8
  - openjdk7
+ - openjdk8
 
 before_install:
  - "export JAVA_OPTS=-Xmx1500m"

From b702bf3d86461da081a346bd7f6e01b06b4b2110 Mon Sep 17 00:00:00 2001
From: Adam Miller <adam@archive.org>
Date: Wed, 11 Oct 2017 21:06:35 +0000
Subject: [PATCH 2/3] WARCLimitEnforcer.java - Add support for multiple warc
 writers.

---
 .../postprocessor/WARCLimitEnforcer.java      | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/contrib/src/main/java/org/archive/modules/postprocessor/WARCLimitEnforcer.java b/contrib/src/main/java/org/archive/modules/postprocessor/WARCLimitEnforcer.java
index 29f82f0b..bd29362f 100644
--- a/contrib/src/main/java/org/archive/modules/postprocessor/WARCLimitEnforcer.java
+++ b/contrib/src/main/java/org/archive/modules/postprocessor/WARCLimitEnforcer.java
@@ -22,7 +22,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Logger;
-
+import java.util.ArrayList;
+import java.util.List;
 import org.archive.crawler.framework.CrawlController;
 import org.archive.crawler.framework.CrawlStatus;
 import org.archive.modules.CrawlURI;
@@ -56,6 +57,17 @@ public class WARCLimitEnforcer extends Processor {
         return warcWriter;
     }
 
+    {
+        setWarcWriters(new ArrayList<WARCWriterProcessor>());
+    }
+    @SuppressWarnings("unchecked")
+    public List<WARCWriterProcessor> getWarcWriters() {
+        return (List<WARCWriterProcessor>) kp.get("warcWriters");
+    }
+    public void setWarcWriters(List<WARCWriterProcessor> warcWriters) {
+        kp.put("warcWriters", warcWriters);
+    }
+
     protected CrawlController controller;
     public CrawlController getCrawlController() {
         return this.controller;
@@ -76,15 +88,27 @@ public class WARCLimitEnforcer extends Processor {
             for (String k: limits.get(j).keySet()) {
                 Long limit = limits.get(j).get(k);
 
-                Map<String, AtomicLong> valueBucket = warcWriter.getStats().get(j);
-                if (valueBucket != null) {
-                    AtomicLong value = valueBucket.get(k);
-                    if (value != null
-                            && value.get() >= limit) {
-                        log.info("stopping crawl because warcwriter stats['" + j + "']['" + k + "']=" + value.get() + " exceeds limit " + limit);
-                        controller.requestCrawlStop(CrawlStatus.FINISHED_WRITE_LIMIT);
+                AtomicLong value = null;
+                if(getWarcWriters() !=null && getWarcWriters().size()>0) {
+                    value = new AtomicLong(0);
+                    for (WARCWriterProcessor w: getWarcWriters()) {
+                        Map<String, AtomicLong> valueBucket = w.getStats().get(j);
+                        if(valueBucket != null) {
+                            value.set(value.addAndGet(valueBucket.get(k).get()));
+                        }
                     }
                 }
+                else {
+                    Map<String, AtomicLong> valueBucket = warcWriter.getStats().get(j);
+                    if(valueBucket != null) {
+                        value = valueBucket.get(k);
+                    }
+                }
+                if (value != null
+                        && value.get() >= limit) {
+                    log.info("stopping crawl because warcwriter stats['" + j + "']['" + k + "']=" + value.get() + " exceeds limit " + limit);
+                    controller.requestCrawlStop(CrawlStatus.FINISHED_WRITE_LIMIT);
+                }
             }
         }
     }

From ae8a0ef95fd669a96f45655be22882082734aa56 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Wed, 11 Oct 2017 14:54:37 -0700
Subject: [PATCH 3/3] update webarchive-commons dependency to incorporate fix
 to warc size calculation, and uncomment test that exercises the fix

---
 commons/pom.xml                                                | 2 +-
 .../org/archive/modules/writer/WARCWriterProcessorTest.java    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 75c31503..f3d5e564 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -188,7 +188,7 @@
 		<dependency>
 			<groupId>org.netpreserve.commons</groupId>
 			<artifactId>webarchive-commons</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.8</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.hadoop</groupId>
diff --git a/modules/src/test/java/org/archive/modules/writer/WARCWriterProcessorTest.java b/modules/src/test/java/org/archive/modules/writer/WARCWriterProcessorTest.java
index 22ef5811..582705b0 100644
--- a/modules/src/test/java/org/archive/modules/writer/WARCWriterProcessorTest.java
+++ b/modules/src/test/java/org/archive/modules/writer/WARCWriterProcessorTest.java
@@ -185,8 +185,7 @@ public class WARCWriterProcessorTest extends ProcessorTestBase {
         assertEquals(4, wwp.getStats().get("totals").get("numRecords").get());
         assertEquals(responseBytes.length, wwp.getStats().get("response").get("contentBytes").get());
 
-        // XXX fails currently, needs https://github.com/iipc/webarchive-commons/pull/51
-        // assertEquals(warc.length(), wwp.getStats().get("totals").get("sizeOnDisk").get());
+        assertEquals(warc.length(), wwp.getStats().get("totals").get("sizeOnDisk").get());
     }
 
     /**