From 9be8267b7f3495d8de4b420f77418553939d11d7 Mon Sep 17 00:00:00 2001 From: Rawlin Peters Date: Tue, 1 Dec 2020 11:49:34 -0700 Subject: [PATCH] Fix TR NullPointerException from LetsEncryptDnsChallengeWatcher Because databasesDirectory is already a property of the extended class AbstractServiceUpdater, it should not be redeclared in LetsEncryptDnsChallengeWatcher. Also, log exceptions when catching them in order to capture the full stacktraces in the log. --- .../core/ds/LetsEncryptDnsChallengeWatcher.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java index f009f6a893..8525251134 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java @@ -29,7 +29,6 @@ import org.apache.log4j.Logger; import java.io.*; -import java.nio.file.Path; import java.time.Instant; import java.util.HashMap; import java.util.List; @@ -40,7 +39,6 @@ public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher { private String configFile; private ConfigHandler configHandler; - private Path databasesDirectory; public LetsEncryptDnsChallengeWatcher() { setDatabaseUrl(DEFAULT_LE_DNS_CHALLENGE_URL); @@ -106,7 +104,7 @@ public boolean useData(final String data) { return true; } catch (Exception e) { - LOGGER.warn("Failed updating dns challenge txt record with data from " + dataBaseURL + ": " + e.getMessage()); + LOGGER.warn("Failed updating dns challenge txt record with data from " + dataBaseURL + ":", e); } return false; @@ -119,7 +117,7 @@ protected boolean verifyData(final String data) { mapper.readValue(data, new TypeReference>>() { }); return true; } catch (Exception e) { - LOGGER.warn("Failed to build dns challenge data while verifying"); + LOGGER.warn("Failed to build dns challenge data while verifying:", e); } return false; @@ -142,7 +140,7 @@ private String readConfigFile() { } return sb.toString(); } catch (Exception e) { - LOGGER.error("Could not read cr-config file " + configFile + "."); + LOGGER.error("Could not read cr-config file " + configFile + ":", e); return null; } } @@ -183,10 +181,6 @@ public ConfigHandler getConfigHandler() { return this.configHandler; } - public void setDatabasesDirectory(final Path databasesDirectory) { - this.databasesDirectory = databasesDirectory; - } - public void setConfigFile(final String configFile) { this.configFile = configFile; }