Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Fix TR NullPointerException in LetsEncryptDnsChallengeWatcher #5342

Merged
mattjackson220 merged 1 commit into from
Dec 8, 2020
Merged

Fix TR NullPointerException in LetsEncryptDnsChallengeWatcher #5342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions ...om/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -119,7 +117,7 @@ protected boolean verifyData(final String data) {
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;
Expand All @@ -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;
}
}
Expand Down Expand Up @@ -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;
}
Expand Down