hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 05:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkModulePresence now raises exception instead of its callers

Browse Source
This commit is contained in:
marc tobias
2019-04-02 18:37:11 +02:00
parent 2a4198f94d
commit 84149f26df
4 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/setup/SetupClass.php
View File

@@ -144,9 +144,7 @@ class SetupFunctions
}
// Try accessing the C module, so we know early if something is wrong
if (!checkModulePresence()) {
fail('error loading nominatim.so module');
}
checkModulePresence(); // raises exception on failure
if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) {
echo 'Error: you need to download the country_osm_grid first:';
@@ -227,11 +225,9 @@ class SetupFunctions
{
info('Create Functions');
// Try accessing the C module, so we know eif something is wrong
// update.php calls this function
if (!checkModulePresence()) {
fail('error loading nominatim.so module');
}
// Try accessing the C module, so we know early if something is wrong
checkModulePresence(); // raises exception on failure
$this->createSqlFunctions();
}