retry loop on osmosis

diff --git a/utils/update.php b/utils/update.php
index 3c6580dc0b5c1c91b97850424373b378a4de257d..7fc864c57f655e09c0539e20bb7d3a80a307d56b 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -1,5 +1,6 @@
 #!/usr/bin/php -Cq
 <?php
 #!/usr/bin/php -Cq
 <?php

+

         require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
         ini_set('memory_limit', '800M');
 
         require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
         ini_set('memory_limit', '800M');
 


@@ -323,10 +324,12 @@
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);

-                                       if ($iErrorLevel)
+                                       while ($iErrorLevel == 1)

                                        {
                                                echo "Error: $iErrorLevel\n";
                                        {
                                                echo "Error: $iErrorLevel\n";

-                                               exit;
+                                               sleep(60);
+                                               echo 'Re-trying: '.$sCMDDownload."\n";
+                                               exec($sCMDDownload, $sJunk, $iErrorLevel);

                                        }
                                        $iFileSize = filesize($sImportFile);
                                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
                                        }
                                        $iFileSize = filesize($sImportFile);
                                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);


@@ -418,7 +421,6 @@
                                echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\n";
                                if (!$aResult['import-osmosis-all']) exit;
 //                     }
                                echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\n";
                                if (!$aResult['import-osmosis-all']) exit;
 //                     }

-

                        echo "Sleeping ".max(0,60-$fDuration)." seconds\n";
                        sleep(max(0,60-$fDuration));
                }
                        echo "Sleeping ".max(0,60-$fDuration)." seconds\n";
                        sleep(max(0,60-$fDuration));
                }


@@ -448,7 +450,7 @@
                        $sImportFile .= ".npi";
                        while(!file_exists($sImportFile) && !file_exists($sImportFile.'.bz2'))
                        {
                        $sImportFile .= ".npi";
                        while(!file_exists($sImportFile) && !file_exists($sImportFile.'.bz2'))
                        {

-                               echo "sleep\n";
+                               echo "sleep (waiting for $sImportFile)\n";

                                sleep(10);
                        }
                        if (file_exists($sImportFile.'.bz2')) $sImportFile .= '.bz2';
                                sleep(10);
                        }
                        if (file_exists($sImportFile.'.bz2')) $sImportFile .= '.bz2';