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

Merge pull request #340 from calimeroteknik/update-with-exit-errorcodes

Browse Source 
utils/update.php: make the process exit with an non-zero error code if the update fails
This commit is contained in:
Sarah Hoffmann
2015-12-07 20:24:03 +01:00
parent 2e1281b9a0 fb7d65b8c3
commit af150bc63e
1 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
utils/update.php
View File

@@ -54,15 +54,13 @@
// Lock to prevent multiple copies running // Lock to prevent multiple copies running
if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1) if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1)
{ {
echo "Copy already running\n"; fail("Copy already running\n");
exit;
} }
if (!isset($aResult['max-load'])) $aResult['max-load'] = 1.9; if (!isset($aResult['max-load'])) $aResult['max-load'] = 1.9;
if (!isset($aResult['max-blocking'])) $aResult['max-blocking'] = 3; if (!isset($aResult['max-blocking'])) $aResult['max-blocking'] = 3;
if (getBlockingProcesses() > $aResult['max-blocking']) if (getBlockingProcesses() > $aResult['max-blocking'])
{ {
echo "Too many blocking processes for import\n"; fail("Too many blocking processes for import\n");
exit;
} }
*/ */
@@ -120,8 +118,7 @@
$sNextFile = $aResult['import-diff']; $sNextFile = $aResult['import-diff'];
if (!file_exists($sNextFile)) if (!file_exists($sNextFile))
{ {
echo "Cannot open $sNextFile\n"; fail("Cannot open $sNextFile\n");
exit;
} }
// Don't update the import status - we don't know what this file contains // Don't update the import status - we don't know what this file contains
$sUpdateSQL = 'update import_status set lastimportdate = now() where false'; $sUpdateSQL = 'update import_status set lastimportdate = now() where false';
@@ -137,8 +134,7 @@
if ($iErrorLevel) if ($iErrorLevel)
{ {
echo "Error from osm2pgsql, $iErrorLevel\n"; fail("Error from osm2pgsql, $iErrorLevel\n");
exit;
} }
// Move the date onwards // Move the date onwards
@@ -205,8 +201,7 @@
exec($sCMD, $sJunk, $iErrorLevel); exec($sCMD, $sJunk, $iErrorLevel);
if ($iErrorLevel) if ($iErrorLevel)
{ {
echo "Error converting osm to osc, osmosis returned: $iErrorLevel\n"; fail("Error converting osm to osc, osmosis returned: $iErrorLevel\n");
exit;
} }
} }
else else
@@ -221,8 +216,7 @@
$hProc = proc_open($sCMD, $aSpec, $aPipes); $hProc = proc_open($sCMD, $aSpec, $aPipes);
if (!is_resource($hProc)) if (!is_resource($hProc))
{ {
echo "Error converting osm to osc, osmosis failed\n"; fail("Error converting osm to osc, osmosis failed\n");
exit;
} }
fwrite($aPipes[0], $sModifyXMLstr); fwrite($aPipes[0], $sModifyXMLstr);
fclose($aPipes[0]); fclose($aPipes[0]);
@@ -237,7 +231,7 @@
echo "Error converting osm to osc, osmosis returned: $iError\n"; echo "Error converting osm to osc, osmosis returned: $iError\n";
echo $sOut; echo $sOut;
echo $sErrors; echo $sErrors;
exit; exit(-1);
} }
} }
@@ -247,8 +241,7 @@
exec($sCMD, $sJunk, $iErrorLevel); exec($sCMD, $sJunk, $iErrorLevel);
if ($iErrorLevel) if ($iErrorLevel)
{ {
echo "osm2pgsql exited with error level $iErrorLevel\n"; fail("osm2pgsql exited with error level $iErrorLevel\n");
exit;
} }
} }
@@ -257,8 +250,7 @@
$pgver = (float) CONST_Postgresql_Version; $pgver = (float) CONST_Postgresql_Version;
if ($pgver < 9.3) { if ($pgver < 9.3) {
echo "ERROR: deduplicate is only currently supported in postgresql 9.3"; fail("ERROR: deduplicate is only currently supported in postgresql 9.3");
exit;
} }
$oDB =& getDB(); $oDB =& getDB();
@@ -281,7 +273,7 @@
if (PEAR::isError($aTokenSet)) if (PEAR::isError($aTokenSet))
{ {
var_dump($aTokenSet, $sSQL); var_dump($aTokenSet, $sSQL);
exit; exit(1);
} }
$aKeep = array_shift($aTokenSet); $aKeep = array_shift($aTokenSet);
@@ -297,7 +289,7 @@
if (PEAR::isError($x)) if (PEAR::isError($x))
{ {
var_dump($x); var_dump($x);
exit; exit(1);
} }
$sSQL = "update search_name set"; $sSQL = "update search_name set";
@@ -307,7 +299,7 @@
if (PEAR::isError($x)) if (PEAR::isError($x))
{ {
var_dump($x); var_dump($x);
exit; exit(1);
} }
$sSQL = "update location_area_country set"; $sSQL = "update location_area_country set";
@@ -317,7 +309,7 @@
if (PEAR::isError($x)) if (PEAR::isError($x))
{ {
var_dump($x); var_dump($x);
exit; exit(1);
} }
foreach ($aPartitions as $sPartition) foreach ($aPartitions as $sPartition)
@@ -329,7 +321,7 @@
if (PEAR::isError($x)) if (PEAR::isError($x))
{ {
var_dump($x); var_dump($x);
exit; exit(1);
} }
$sSQL = "update location_area_country set"; $sSQL = "update location_area_country set";
@@ -339,7 +331,7 @@
if (PEAR::isError($x)) if (PEAR::isError($x))
{ {
var_dump($x); var_dump($x);
exit; exit(1);
} }
} }
@@ -348,7 +340,7 @@
if (PEAR::isError($x)) if (PEAR::isError($x))
{ {
var_dump($x); var_dump($x);
exit; exit(1);
} }
} }
@@ -364,8 +356,7 @@
{ {
if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) { if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
echo "Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n"; fail("Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n");
exit;
} }
$sImportFile = CONST_BasePath.'/data/osmosischange.osc'; $sImportFile = CONST_BasePath.'/data/osmosischange.osc';
@@ -527,7 +518,7 @@
$fDuration = time() - $fStartTime; $fDuration = time() - $fStartTime;
echo date('Y-m-d H:i:s')." Completed all for $sBatchEnd in ".round($fDuration/60,2)." minutes\n"; echo date('Y-m-d H:i:s')." Completed all for $sBatchEnd in ".round($fDuration/60,2)." minutes\n";
if (!$aResult['import-osmosis-all']) exit; if (!$aResult['import-osmosis-all']) exit(0);
if ( CONST_Replication_Update_Interval > 60 ) if ( CONST_Replication_Update_Interval > 60 )
{ {
@@ -549,7 +540,7 @@
if (PEAR::isError($iNPIID)) if (PEAR::isError($iNPIID))
{ {
var_dump($iNPIID); var_dump($iNPIID);
exit; exit(1);
} }
$sConfigDirectory = CONST_BasePath.'/settings'; $sConfigDirectory = CONST_BasePath.'/settings';
$sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F '; $sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F ';
@@ -580,8 +571,7 @@
exec($sCMDImport, $sJunk, $iErrorLevel); exec($sCMDImport, $sJunk, $iErrorLevel);
if ($iErrorLevel) if ($iErrorLevel)
{ {
echo "Error: $iErrorLevel\n"; fail("Error: $iErrorLevel\n");
exit;
} }
$sBatchEnd = $iNPIID; $sBatchEnd = $iNPIID;
echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n"; echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";