rife2/rife2-template-renderers
rife2/rife2-template-renderers
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added error logging to fetchUrl

Browse source
This commit is contained in:
Erik C. Thauvin 2023-03-25 20:50:03 -07:00
parent 4bba966770
commit 0ca9f5b9f8
1 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/src/main/java/rife/render/RenderUtils.java
View file

@ -23,6 +23,7 @@ import rife.tools.StringUtils;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.Normalizer; import java.text.Normalizer;
@ -32,6 +33,8 @@ import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField; import java.time.temporal.ChronoField;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* Collection of utility-type methods commonly used by the renderers. * Collection of utility-type methods commonly used by the renderers.
@ -44,7 +47,6 @@ public final class RenderUtils {
* The encoding property. * The encoding property.
*/ */
public static final String ENCODING_PROPERTY = "encoding"; public static final String ENCODING_PROPERTY = "encoding";
/** /**
* ISO 8601 date formatter. * ISO 8601 date formatter.
* *
@ -82,6 +84,7 @@ public final class RenderUtils {
DateTimeFormatter.ofPattern("EEE, d MMM yyyy HH:mm:ss zzz").withLocale(Localization.getLocale()); DateTimeFormatter.ofPattern("EEE, d MMM yyyy HH:mm:ss zzz").withLocale(Localization.getLocale());
private static final String DEFAULT_USER_AGENT = private static final String DEFAULT_USER_AGENT =
"Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0"; "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0";
private final static Logger LOGGER = Logger.getLogger(RenderUtils.class.getName());
private RenderUtils() { private RenderUtils() {
// no-op // no-op
@ -208,15 +211,26 @@ public final class RenderUtils {
*/ */
public static String fetchUrl(String url, String defaultContent) { public static String fetchUrl(String url, String defaultContent) {
try { try {
var connection = (HttpURLConnection) new URL(url).openConnection(); var fetchUrl = new URL(url);
connection.setRequestProperty("User-Agent", DEFAULT_USER_AGENT); try {
var code = connection.getResponseCode(); var connection = (HttpURLConnection) fetchUrl.openConnection();
if (code >= 200 && code <= 399) { connection.setRequestProperty("User-Agent", DEFAULT_USER_AGENT);
try (var inputStream = connection.getInputStream()) { var code = connection.getResponseCode();
return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); if (code >= 200 && code <= 399) {
try (var inputStream = connection.getInputStream()) {
return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
}
} else {
if (LOGGER.isLoggable(Level.WARNING)) {
LOGGER.warning("A " + code + " status code was returned by " + fetchUrl.getHost());
}
}
} catch (IOException ioe) {
if (LOGGER.isLoggable(Level.WARNING)) {
LOGGER.log(Level.WARNING, "An IO error occurred while connecting to " + fetchUrl.getHost(), ioe);
} }
} }
} catch (IOException ignore) { } catch (MalformedURLException ignore) {
// do nothing // do nothing
} }
return defaultContent; return defaultContent;
@ -338,7 +352,7 @@ public final class RenderUtils {
} }
/** /**
* Returns a new {@code Properties} containing the properties specified in the given {$String}. * Returns a new {@code Properties} containing the properties specified in the given {@code String}.
* *
* @param src the {@code} String containing the properties * @param src the {@code} String containing the properties
* @return the new {@code Properties} * @return the new {@code Properties}