From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 27 May 2017 13:00:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~392
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/49ac49228ee208f7b219ee8ea8e1b199d6486245

Merge remote-tracking branch 'upstream/master'
---

49ac49228ee208f7b219ee8ea8e1b199d6486245
diff --cc utils/update.php
index 475e5836,b106c567..ad627482
--- a/utils/update.php
+++ b/utils/update.php
@@@ -36,7 -37,7 +37,13 @@@ $aCMDOption
    );
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
--if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
++if (!isset($aResult['index-instances'])) {
++    if (getLoadAverage() < 24)
++        $aResult['index-instances'] = 2;
++    else
++        $aResult['index-instances'] = 1;
++}
++
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');