X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-cdrrewrited;h=846b0b976cc485f9c2e1a2f882d5d3bcac103b95;hb=8688a1fe1b157c1061e928823d81ba1b7f34cde8;hp=a365d73db931b27f03bc355273c59c3556c9b543;hpb=9531bdfc326d205f18a5d5f05312aa20ba1484bc;p=freeside.git

diff --git a/FS/bin/freeside-cdrrewrited b/FS/bin/freeside-cdrrewrited
index a365d73db..846b0b976 100644
--- a/FS/bin/freeside-cdrrewrited
+++ b/FS/bin/freeside-cdrrewrited
@@ -41,14 +41,15 @@ while (1) {
   # rewritten "skipped", i.e. why we're a daemon in the first place
   # instead of just doing this search like normal CDRs
 
-  my @recent = grep { ($accountcode_unmatch{$_} + $accountcode_retry) < time }
-                 keys %accountcode_unmatch;
   #hmm :/
-  my $extra_sql = '';
-  $extra_sql .= ' AND acctid NOT IN (', join(',', @recent). ') '
-    if @recent;
+  my @recent = grep { ($accountcode_unmatch{$_} + $accountcode_retry) > time }
+                 keys %accountcode_unmatch;
+  my $extra_sql = scalar(@recent)
+                    ? ' AND acctid NOT IN ('. join(',', @recent). ') '
+                    : '';
 
   my $found = 0;
+  my %skip = ();
   foreach my $cdr ( 
     qsearch( {
       'table'     => 'cdr',
@@ -61,6 +62,8 @@ while (1) {
     } )
   ) {
 
+    next if $skip{$cdr->acctid};
+
     $found = 1;
     my @status = ();
 
@@ -106,8 +109,10 @@ while (1) {
         my $cantfind = "can't find primary CDR with session ". $cdr->sessionnum.
                        ", src ". $cdr->subscriber;
         if ( $cdr->calldate_unix + $accountcode_giveup < time ) {
+          warn "ERROR: $cantfind; giving up\n";
           push @status, 'taqua-accountcode-NOTFOUND';
           $cdr->status('done'); #so it doesn't try to rate
+          delete $accountcode_unmatch{$cdr->acctid}; #so it doesn't suck mem
         } else {
           warn "WARNING: $cantfind; will keep trying\n";
           $accountcode_unmatch{$cdr->acctid} = time;
@@ -123,6 +128,7 @@ while (1) {
           warn "WARNING: error rewriting primary CDR (will retry): $error\n";
           next;
         }
+        $skip{$primary->acctid} = 1;
 
         push @status, 'taqua-accountcode';
         $cdr->status('done'); #so it doesn't try to rate