X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3fda7929294e6c7e59f75854d8ff372e22f0f4d2..26bc83c9844ceba531837bfed79cd51b12a6b45a:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 259ddf2d..a7f77e55 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -61,8 +61,8 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) {
 }
 
 
-// This is a pretty hard core default - the number of processors in the box - 1
-$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(getProcessorCount()-1);
+// by default, use all but one processor, but never more than 15.
+$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(min(16,getProcessorCount())-1);
 if ($iInstances < 1) {
     $iInstances = 1;
     warn("resetting threads to $iInstances");