Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 82362b3119c174993583f38bc42904ec6f42efab..a05ad9e4e53bf7044e09037ce6bdb5d38baf2b39 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -329,7 +329,16 @@
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
                        // Index file
-                       $sThisIndexCmd = $sCMDIndex;
+                       if (!isset($aResult['index-instances']))
+                       {
+                               if (getLoadAverage() < 24)
+                                       $iIndexInstances = 2;
+                               else
+                                       $iIndexInstances = 1;
+                       } else
+                               $iIndexInstances = $aResult['index-instances'];
+
+                       $sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
                        $fCMDStartTime = time();
 
                        if (!$aResult['no-index'])