X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/120d866e3e0afa2de041e60b79d622dc9f7a8cb7..095dbe671880a9457960295425300e054feb6a1a:/utils/update.php

diff --git a/utils/update.php b/utils/update.php
index fd6acdbb..ccf69300 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -47,7 +47,6 @@
 		showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
 	}
 
-	if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 	if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
 /*
@@ -74,6 +73,7 @@
 	$oDB =& getDB();
 
 	$aDSNInfo = DB::parseDSN(CONST_Database_DSN);
+	if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
 
 	// cache memory to be used by osm2pgsql, should not be more than the available memory
 	$iCacheMemory = (isset($aResult['osm2pgsql-cache'])?$aResult['osm2pgsql-cache']:2000);
@@ -82,7 +82,7 @@
 		$iCacheMemory = getCacheMemoryMB();
 		echo "WARNING: resetting cache memory to $iCacheMemory\n";
 	}
-	$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'];
+	$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
 	if (!is_null(CONST_Osm2pgsql_Flatnode_File))
 	{
 		$sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
@@ -360,7 +360,8 @@
 
 	if ($aResult['index'])
 	{
-		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
+		if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
+		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
 	}
 
 	if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
@@ -370,7 +371,6 @@
 			echo "Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n";
 			exit;
 		}
-exit;
 
 		$sImportFile = CONST_BasePath.'/data/osmosischange.osc';
 		$sOsmosisCMD = CONST_Osmosis_Binary;
@@ -378,7 +378,7 @@ exit;
 		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
 		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
 		$sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
-		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'];
+		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
 		if (!$aResult['no-npi']) {
 			$sCMDIndex .= '-F ';
 		}
@@ -418,8 +418,9 @@ exit;
 							exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
 						}
 						// There are new replication files - use osmosis to download the file
-						echo "\nReplication Delay is ".$aReplicationLag[0]."\n";
+						echo "\n".date('Y-m-d H:i:s')." Replication Delay is ".$aReplicationLag[0]."\n";
 					}
+					$fStartTime = time();
 					$fCMDStartTime = time();
 					echo $sCMDDownload."\n";
 					exec($sCMDDownload, $sJunk, $iErrorLevel);
@@ -432,9 +433,10 @@ exit;
 					}
 					$iFileSize = filesize($sImportFile);
 					$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
-					echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
 					$sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','osmosis')";
+					var_Dump($sSQL);
 					$oDB->query($sSQL);
+					echo date('Y-m-d H:i:s')." Completed osmosis step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
 				}
 
 				$iFileSize = filesize($sImportFile);
@@ -447,12 +449,12 @@ exit;
 				if ($iErrorLevel)
 				{
 					echo "Error: $iErrorLevel\n";
-					exit;
+					exit($iErrorLevel);
 				}
-				echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
 				$sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','osm2pgsql')";
 				var_Dump($sSQL);
 				$oDB->query($sSQL);
+				echo date('Y-m-d H:i:s')." Completed osm2pgsql step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
 
 				// Archive for debug?
 				unlink($sImportFile);
@@ -461,16 +463,25 @@ exit;
 			$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
 			// Index file
-			$sThisIndexCmd = $sCMDIndex;
+			if (!isset($aResult['index-instances']))
+			{
+				if (getLoadAverage() < 24)
+					$iIndexInstances = 2;
+				else
+					$iIndexInstances = 1;
+			} else
+				$iIndexInstances = $aResult['index-instances'];
+
+			$sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
+			$fCMDStartTime = time();
 
 			if (!$aResult['no-npi'])
 			{
-				$fCMDStartTime = time();
 				$iFileID = $oDB->getOne('select nextval(\'file\')');
 				if (PEAR::isError($iFileID))
 				{
 					echo $iFileID->getMessage()."\n";
-					exit;
+					exit(-1);
 				} 
 				$sFileDir = CONST_BasePath.'/export/diff/';
 				$sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
@@ -496,7 +507,7 @@ exit;
 				if ($iErrorLevel)
 				{
 					echo "Error: $iErrorLevel\n";
-					exit;
+					exit($iErrorLevel);
 				}
 
 				if (!$aResult['no-npi'])
@@ -511,7 +522,7 @@ exit;
 					if ($iErrorLevel)
 					{
 						echo "Error: $iErrorLevel\n";
-						exit;
+						exit($iErrorLevel);
 					}
 
 					rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",
@@ -519,26 +530,27 @@ exit;
 				}
 			}
 
-			echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
 			$sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','index')";
+			var_Dump($sSQL);
 			$oDB->query($sSQL);
+			echo date('Y-m-d H:i:s')." Completed index step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
 
 			$sSQL = "update import_status set lastimportdate = '$sBatchEnd'";
 			$oDB->query($sSQL);
 
 			$fDuration = time() - $fStartTime;
-			echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\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 ( CONST_Replication_Update_Interval > 60 )
 			{
-				$iSleep = round(CONST_Replication_Update_Interval*0.8);
+				$iSleep = max(0,(strtotime($sBatchEnd)+CONST_Replication_Update_Interval-time()));
 			}
 			else
 			{
 				$iSleep = max(0,CONST_Replication_Update_Interval-$fDuration);
 			}
-			echo "Sleeping $iSleep seconds\n";
+			echo date('Y-m-d H:i:s')." Sleeping $iSleep seconds\n";
 			sleep($iSleep);
 		}