Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore duplicate names in cloudflare dns zone cache #247

Merged
merged 1 commit into from
Feb 15, 2018
Merged

Ignore duplicate names in cloudflare dns zone cache #247

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
14 changes: 12 additions & 2 deletions ...c/main/java/com/hubspot/baragon/service/edgecache/cloudflare/client/CloudflareClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ public CloudflareClient(EdgeCacheConfiguration edgeCacheConfiguration,
this.zoneCache = Suppliers.memoizeWithExpiration(() -> {
try {
return retrieveAllZones().stream().collect(Collectors.toConcurrentMap(
CloudflareZone::getName, Function.identity()
CloudflareZone::getName,
Function.identity(),
(name1, name2) -> {
LOG.debug("Duplicate name found", name1);
return name1;
}
));
} catch (CloudflareClientException e) {
LOG.error("Unable to refresh Cloudflare zone cache", e);
Expand All @@ -88,7 +93,12 @@ public CloudflareClient(EdgeCacheConfiguration edgeCacheConfiguration,
@Override
public Map<String, CloudflareDnsRecord> load(String zoneId) throws Exception {
return retrieveDnsRecords(zoneId).stream().collect(Collectors.toConcurrentMap(
CloudflareDnsRecord::getName, Function.identity()
CloudflareDnsRecord::getName,
Function.identity(),
(name1, name2) -> {
LOG.debug("Duplicate name found", name1);
return name1;
}
));
}
});
Expand Down