From 7bfb19aa35e67c6d3f08cbcef3c155aa1b2d604f Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Fri, 18 Nov 2016 17:46:41 +0800
Subject: [PATCH] Improved logging for CachedResource (especially when dealing
 with malformed XML or JSON responses)

---
 source/net/filebot/CachedResource.java | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/source/net/filebot/CachedResource.java b/source/net/filebot/CachedResource.java
index 748274fc..4bd734bf 100644
--- a/source/net/filebot/CachedResource.java
+++ b/source/net/filebot/CachedResource.java
@@ -18,6 +18,7 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.logging.Level;
 
 import org.w3c.dom.Document;
 
@@ -96,8 +97,8 @@ public class CachedResource<K, R> implements Resource<R> {
 				}
 
 				return parse.transform(data);
-			} catch (IOException e) {
-				debug.warning(format("Fetch failed: %s [%s]", e, url));
+			} catch (Exception e) {
+				debug.severe(format("Fetch failed: %s [%s]", e, url));
 
 				// use previously cached data if possible
 				if (element == null || element.getObjectValue() == null) {
@@ -126,7 +127,7 @@ public class CachedResource<K, R> implements Resource<R> {
 				throw e;
 			}
 
-			debug.fine(format("Fetch failed: Try again in %d seconds (%d more) => %s", retryWaitTime.getSeconds(), retryCount, e));
+			debug.warning(format("Fetch failed: Try again in %d seconds (%d more) => %s", retryWaitTime.getSeconds(), retryCount, e));
 			Thread.sleep(retryWaitTime.toMillis());
 			return retry(callable, retryCount - 1, retryWaitTime.multipliedBy(2));
 		}
@@ -164,16 +165,26 @@ public class CachedResource<K, R> implements Resource<R> {
 	public static <T> Transform<T, String> validateXml(Transform<T, String> parse) {
 		return object -> {
 			String xml = parse.transform(object);
-			WebRequest.validateXml(xml);
-			return xml;
+			try {
+				WebRequest.validateXml(xml);
+				return xml;
+			} catch (Exception e) {
+				debug.log(Level.WARNING, xml, e);
+				throw e;
+			}
 		};
 	}
 
 	public static <T> Transform<T, String> validateJson(Transform<T, String> parse) {
 		return object -> {
 			String json = parse.transform(object);
-			JsonUtilities.readJson(json);
-			return json;
+			try {
+				JsonUtilities.readJson(json);
+				return json;
+			} catch (Exception e) {
+				debug.log(Level.WARNING, json, e);
+				throw e;
+			}
 		};
 	}