zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 16:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add human-readable responses when manually running batch []s

Browse source 
This will make potential issues a little nicer to debug in the future, because
the person hitting these endpoints manually will immediately know why they may
not be kicking off a [] console as might be expected.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=134840223
This commit is contained in:
mcilwain 2016-09-30 16:15:30 -07:00 • committed by Ben McIlwain
parent 6785ce277a
commit 3613eff204
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/google/registry/flows/async/DeleteContactsAndHostsAction.java
View file

@ -114,6 +114,7 @@ public class DeleteContactsAndHostsAction implements Runnable {
LeaseOptions.Builder.withCountLimit(maxLeaseCount()).leasePeriod(LEASE_MINUTES, MINUTES); LeaseOptions.Builder.withCountLimit(maxLeaseCount()).leasePeriod(LEASE_MINUTES, MINUTES);
List<TaskHandle> tasks = queue.leaseTasks(options); List<TaskHandle> tasks = queue.leaseTasks(options);
if (tasks.isEmpty()) { if (tasks.isEmpty()) {
response.setPayload("No contact/host deletion tasks in pull queue.");
return; return;
} }
Multiset<String> kindCounts = HashMultiset.create(2); Multiset<String> kindCounts = HashMultiset.create(2);
@ -143,6 +144,7 @@ public class DeleteContactsAndHostsAction implements Runnable {
ImmutableList<DeletionRequest> deletionRequests = builder.build(); ImmutableList<DeletionRequest> deletionRequests = builder.build();
if (deletionRequests.isEmpty()) { if (deletionRequests.isEmpty()) {
logger.info("No asynchronous deletions to process because all were already handled."); logger.info("No asynchronous deletions to process because all were already handled.");
response.setPayload("All requested deletions of contacts/hosts have already occurred.");
} else { } else {
logger.infofmt( logger.infofmt(
"Processing asynchronous deletion of %d contacts and %d hosts: %s", "Processing asynchronous deletion of %d contacts and %d hosts: %s",

6
java/google/registry/flows/async/RefreshDnsOnHostRenameAction.java
View file

@ -81,6 +81,7 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
LeaseOptions.Builder.withCountLimit(maxLeaseCount()).leasePeriod(LEASE_MINUTES, MINUTES); LeaseOptions.Builder.withCountLimit(maxLeaseCount()).leasePeriod(LEASE_MINUTES, MINUTES);
List<TaskHandle> tasks = pullQueue.leaseTasks(options); List<TaskHandle> tasks = pullQueue.leaseTasks(options);
if (tasks.isEmpty()) { if (tasks.isEmpty()) {
response.setPayload("No DNS refresh on host rename tasks to process in pull queue.");
return; return;
} }
ImmutableList.Builder<DnsRefreshRequest> requestsBuilder = new ImmutableList.Builder<>(); ImmutableList.Builder<DnsRefreshRequest> requestsBuilder = new ImmutableList.Builder<>();
@ -111,11 +112,12 @@ public class RefreshDnsOnHostRenameAction implements Runnable {
if (refreshRequests.isEmpty()) { if (refreshRequests.isEmpty()) {
logger.info( logger.info(
"No asynchronous DNS refreshes to process because all renamed hosts are deleted."); "No asynchronous DNS refreshes to process because all renamed hosts are deleted.");
return; response.setPayload("All requested DNS refreshes are on hosts that were since deleted.");
} } else {
logger.infofmt("Processing asynchronous DNS refresh for renamed hosts: %s", hostKeys.build()); logger.infofmt("Processing asynchronous DNS refresh for renamed hosts: %s", hostKeys.build());
runMapreduce(refreshRequests, tasks); runMapreduce(refreshRequests, tasks);
} }
}
private void runMapreduce( private void runMapreduce(
ImmutableList<DnsRefreshRequest> refreshRequests, List<TaskHandle> tasks) { ImmutableList<DnsRefreshRequest> refreshRequests, List<TaskHandle> tasks) {