diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-05-07 18:30:09 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-05-07 18:30:09 -0700 |
| commit | cd355e1366020deacea26c21e6953a73458fe79b (patch) | |
| tree | 6c2505a2907231f49b631800db7278c7568b8938 | |
| parent | 20d2a04059d45272e06c8677e442913a251f04a2 (diff) | |
fix CDR pre-rating w/rate table included minutes, RT#27267
| -rw-r--r-- | FS/FS/cdr.pm | 4 | ||||
| -rw-r--r-- | FS/bin/freeside-cdrrated | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index d13c88bc4..c2be4f2ec 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -896,8 +896,8 @@ sub rate_prefix { # The rate detail itself has included minutes. We MUST have a place # to track them. my $included_min = $opt{'detail_included_min_hashref'} - or die "unable to rate CDR: rate detail has included minutes, but ". - "no detail_included_min_hashref provided.\n"; + or return "unable to rate CDR: rate detail has included minutes, but ". + "no detail_included_min_hashref provided.\n"; # by default, set the included minutes for this region/time to # what's in the rate_detail diff --git a/FS/bin/freeside-cdrrated b/FS/bin/freeside-cdrrated index f8b64a33b..2966b2e4e 100644 --- a/FS/bin/freeside-cdrrated +++ b/FS/bin/freeside-cdrrated @@ -149,9 +149,8 @@ while (1) { 'svcnum' => $svc_phone{$number}->svcnum, ); if ( $error ) { - #XXX ??? - warn $error; - sleep 30; + warn "Can't prerate CDR ". $cdr->acctid. ' to '. $cdr->dst. ": $error"; + #could be an included minutes CDR, so don't sleep 30; } else { #this could get expensive on a per-call basis |