[freeside-commits] freeside/FS/bin freeside-torrus-srvderive, 1.29, 1.30

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv23314

Modified Files:
	freeside-torrus-srvderive 
Log Message:
recover better from mysql's deadlock stupidity, grr, RT#10574

Index: freeside-torrus-srvderive
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-torrus-srvderive,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -d -r1.29 -r1.30
--- freeside-torrus-srvderive	15 Mar 2011 20:56:12 -0000	1.29
+++ freeside-torrus-srvderive	15 Mar 2011 21:26:02 -0000	1.30
@@ -55,7 +55,7 @@
 
 my $orderlimit = "
     ORDER BY srv_date, srv_time
-    LIMIT 100
+    LIMIT 50
 ";
 
 
@@ -130,7 +130,12 @@
           if $DEBUG > 2;
 
         my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
-        $isth->execute( @param )       or die $isth->errstr;
+
+        #stupid mysql deadlocks all the time here, so we need to recover
+        $isth->execute( @param ) or do {
+          warn "Error inserting data for $serviceid$dir (restarting): ".
+               $isth->errstr;
+        }
                         
       }