[freeside-commits] branch FREESIDE_3_BRANCH updated. dd2048e8605404a4a55167555330473a6ce26437

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  dd2048e8605404a4a55167555330473a6ce26437 (commit)
      from  6420848d0d09e72f99196c5e5505662cee1bcab7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dd2048e8605404a4a55167555330473a6ce26437
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed May 7 18:30:10 2014 -0700

    fix CDR pre-rating w/rate table included minutes, RT#27267

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index d13c88b..c2be4f2 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 f8b64a3..2966b2e 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

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cdr.pm             |    4 ++--
 FS/bin/freeside-cdrrated |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)