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

Rethrow exceptions in ExpandRecurringBillingEventsAction

Browse source 
Also fixes bug in handling of future-dated Recurring billing events.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140048357
This commit is contained in:
ctingue 2016-11-23 10:40:14 -08:00 • committed by Ben McIlwain
parent 9a616ccd7f
commit 35d88a9f8c
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
java/google/registry/batch/ExpandRecurringBillingEventsAction.java
View file

@ -138,6 +138,11 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
return;
}
getContext().incrementCounter("Recurring billing events encountered");
// Ignore any recurring billing events that have yet to apply.
if (recurring.getEventTime().isAfter(executeTime)) {
getContext().incrementCounter("Recurring billing events ignored");
return;
}
int billingEventsSaved = 0;
try {
billingEventsSaved = ofy().transactNew(new Work<Integer>() {
@ -199,6 +204,7 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
t, "Error while expanding Recurring billing events for %s", recurring.getId());
getContext().incrementCounter("error: " + t.getClass().getSimpleName());
getContext().incrementCounter(ERROR_COUNTER);
throw t;
}
if (!isDryRun) {
getContext().incrementCounter("Saved OneTime billing events", billingEventsSaved);