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

avoid accessing constants when getting data from env

Browse Source 
When a setting can be read from the environment variable, avoid
accessing the internal defaults. This way the scripts can be
accessed directly in \lib as long as the environment is set up
correctly with full defaults.
This commit is contained in:
Sarah Hoffmann
2021-01-14 09:30:23 +01:00
parent bc09d7aedb
commit 0847964a27
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/setup/SetupClass.php
View File

@@ -42,7 +42,10 @@ class SetupFunctions
$this->iCacheMemory = getCacheMemoryMB();
}
$this->sModulePath = getSetting('DATABASE_MODULE_PATH', CONST_Default_ModulePath);
$this->sModulePath = getSetting('DATABASE_MODULE_PATH');
if (!$this->sModulePath) {
$this->sModulePath = CONST_Default_ModulePath;
}
info('module path: ' . $this->sModulePath);
// parse database string

4
lib/setup_functions.php
View File

@@ -17,7 +17,9 @@ function checkInFile($sOSMFile)
function getOsm2pgsqlBinary()
{
return getSetting('OSM2PGSQL_BINARY', CONST_Default_Osm2pgsql);
$sBinary = getSetting('OSM2PGSQL_BINARY');
return $sBinary ? $sBinary : CONST_Default_Osm2pgsql;
}
function getImportStyle()