safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

respect --osm2pgsql-cache setting

Browse Source 
fixes #260
This commit is contained in:
Sarah Hoffmann
2015-08-08 18:15:14 +02:00
parent 9e5c9ca81d
commit 5581bb67f8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/setup.php
View File

@@ -78,11 +78,13 @@
} }
// Assume we can steal all the cache memory in the box (unless told otherwise) // Assume we can steal all the cache memory in the box (unless told otherwise)
$iCacheMemory = (isset($aCMDResult['osm2pgsql-cache'])?$aCMDResult['osm2pgsql-cache']:getCacheMemoryMB()); if (isset($aCMDResult['osm2pgsql-cache']))
if ($iCacheMemory > getTotalMemoryMB()) {
$iCacheMemory = $aCMDResult['osm2pgsql-cache'];
}
else
{ {
$iCacheMemory = getCacheMemoryMB(); $iCacheMemory = getCacheMemoryMB();
echo "WARNING: resetting cache memory to $iCacheMemory\n";
} }
$aDSNInfo = DB::parseDSN(CONST_Database_DSN); $aDSNInfo = DB::parseDSN(CONST_Database_DSN);