X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7a11e17008efa632eac9fd65b8599814681cb03d..521d6294993f8d8d46d93d514c08556d0c924786:/utils/update.php?ds=sidebyside

diff --git a/utils/update.php b/utils/update.php
index a561aaa3..c6de7af6 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -53,15 +53,13 @@
 	// 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)
 	{
-		echo "Copy already running\n";
-		exit;
+		fail("Copy already running\n");
 	}
 	if (!isset($aResult['max-load'])) $aResult['max-load'] = 1.9;
 	if (!isset($aResult['max-blocking'])) $aResult['max-blocking'] = 3;
 	if (getBlockingProcesses() > $aResult['max-blocking'])
 	{
-		echo "Too many blocking processes for import\n";
-		exit;
+		fail("Too many blocking processes for import\n");
 	}
 */
 
@@ -82,7 +80,7 @@
 		$iCacheMemory = getCacheMemoryMB();
 		echo "WARNING: resetting cache memory to $iCacheMemory\n";
 	}
-	$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
+	$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
 	if (!is_null(CONST_Osm2pgsql_Flatnode_File))
 	{
 		$sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
@@ -119,8 +117,7 @@
 			$sNextFile = $aResult['import-diff'];
 			if (!file_exists($sNextFile))
 			{
-				echo "Cannot open $sNextFile\n";
-				exit;
+				fail("Cannot open $sNextFile\n");
 			}
 			// Don't update the import status - we don't know what this file contains
 			$sUpdateSQL = 'update import_status set lastimportdate = now() where false';
@@ -136,8 +133,7 @@
 
 			if ($iErrorLevel)
 			{
-				echo "Error from osm2pgsql, $iErrorLevel\n";
-				exit;
+				fail("Error from osm2pgsql, $iErrorLevel\n");
 			}
 	
 			// Move the date onwards
@@ -204,8 +200,7 @@
 			exec($sCMD, $sJunk, $iErrorLevel);
 			if ($iErrorLevel)
 			{
-				echo "Error converting osm to osc, osmosis returned: $iErrorLevel\n";
-				exit;
+				fail("Error converting osm to osc, osmosis returned: $iErrorLevel\n");
 			}
 		}
 		else
@@ -220,8 +215,7 @@
 			$hProc = proc_open($sCMD, $aSpec, $aPipes);
 			if (!is_resource($hProc))
 			{
-				echo "Error converting osm to osc, osmosis failed\n";
-				exit;
+				fail("Error converting osm to osc, osmosis failed\n");
 			}
 			fwrite($aPipes[0], $sModifyXMLstr);
 			fclose($aPipes[0]);
@@ -236,7 +230,7 @@
 				echo "Error converting osm to osc, osmosis returned: $iError\n";
 				echo $sOut;
 				echo $sErrors;
-				exit;
+				exit(-1);
 			}
 		}
 
@@ -246,8 +240,7 @@
 		exec($sCMD, $sJunk, $iErrorLevel);
 		if ($iErrorLevel)
 		{
-			echo "osm2pgsql exited with error level $iErrorLevel\n";
-			exit;
+			fail("osm2pgsql exited with error level $iErrorLevel\n");
 		}
 	}
 
@@ -256,8 +249,7 @@
 
 		$pgver = (float) CONST_Postgresql_Version;
                 if ($pgver < 9.3) {
-			echo "ERROR: deduplicate is only currently supported in postgresql 9.3";
-			exit;
+			fail("ERROR: deduplicate is only currently supported in postgresql 9.3");
 		}
 
                 $oDB =& getDB();
@@ -280,7 +272,7 @@
 			if (PEAR::isError($aTokenSet))
 			{
 				var_dump($aTokenSet, $sSQL);
-				exit;
+				exit(1);
 			}
 
 			$aKeep = array_shift($aTokenSet);
@@ -296,7 +288,7 @@
 				if (PEAR::isError($x))
 				{
 					var_dump($x);
-					exit;
+					exit(1);
 				}
 
 				$sSQL = "update search_name set";
@@ -306,7 +298,7 @@
 				if (PEAR::isError($x))
 				{
 					var_dump($x);
-					exit;
+					exit(1);
 				}
 
 				$sSQL = "update location_area_country set";
@@ -316,7 +308,7 @@
 				if (PEAR::isError($x))
 				{
 					var_dump($x);
-					exit;
+					exit(1);
 				}
 
 				foreach ($aPartitions as $sPartition)
@@ -328,7 +320,7 @@
 					if (PEAR::isError($x))
 					{
 						var_dump($x);
-						exit;
+						exit(1);
 					}
 
 					$sSQL = "update location_area_country set";
@@ -338,7 +330,7 @@
 					if (PEAR::isError($x))
 					{
 						var_dump($x);
-						exit;
+						exit(1);
 					}
 				}
 
@@ -347,7 +339,7 @@
 				if (PEAR::isError($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) {
-			echo "Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n";
-			exit;
+			fail("Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n");
 		}
 
 		$sImportFile = CONST_BasePath.'/data/osmosischange.osc';
@@ -536,7 +527,7 @@
 
 			$fDuration = time() - $fStartTime;
 			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 )
 			{
@@ -558,7 +549,7 @@
 		if (PEAR::isError($iNPIID))
 		{
 			var_dump($iNPIID);
-			exit;
+			exit(1);
 		}
 		$sConfigDirectory = CONST_BasePath.'/settings';
 		$sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F ';
@@ -589,8 +580,7 @@
 			exec($sCMDImport, $sJunk, $iErrorLevel);
 			if ($iErrorLevel)
 			{
-				echo "Error: $iErrorLevel\n";
-				exit;
+				fail("Error: $iErrorLevel\n");
 			}
 			$sBatchEnd = $iNPIID;
 			echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";