This is an automated email from the ASF dual-hosted git repository. ocket8888 pushed a commit to branch 5.0.x in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 3d5c52161869042a005cc4ccc64188c7f0820d76 Author: Rawlin Peters <[email protected]> AuthorDate: Tue Dec 8 09:31:53 2020 -0700 Fix TR NullPointerException from LetsEncryptDnsChallengeWatcher (#5342) 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. (cherry picked from commit d4780c387eac270ca301387a7dd4ff0f18f37436) --- .../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 f009f6a..8525251 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 com.fasterxml.jackson.databind.node.ObjectNode; 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 class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher { 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 @@ public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher { mapper.readValue(data, new TypeReference<HashMap<String, List<LetsEncryptDnsChallenge>>>() { }); 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 @@ public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher { } 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 class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher { return this.configHandler; } - public void setDatabasesDirectory(final Path databasesDirectory) { - this.databasesDirectory = databasesDirectory; - } - public void setConfigFile(final String configFile) { this.configFile = configFile; }
