Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index fd6acdbbfd69d0497655cb7d1bd240c379ade4fa..270850f93b4cec6197db67f4c326b28d4f9ff3c0 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -47,7 +47,6 @@
                showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
        }
 
                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;
 
 /*
        if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
 /*


@@ -360,6 +359,7 @@
 
        if ($aResult['index'])
        {
 
        if ($aResult['index'])
        {

+               if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;

                passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
        }
 
                passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
        }
 


@@ -370,7 +370,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;
                }
                        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;
 
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';
                $sOsmosisCMD = CONST_Osmosis_Binary;


@@ -378,7 +377,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;
                $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'];

                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }


@@ -461,7 +460,16 @@ exit;
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
                        // Index file
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
                        // Index file

-                       $sThisIndexCmd = $sCMDIndex;
+                       if (!isset($aResult['index-instances']))
+                       {
+                               if (getLoadAverage() < 15)
+                                       $iIndexInstances = 2;
+                               else
+                                       $iIndexInstances = 1;
+                       } else
+                               $iIndexInstances = $aResult['index-instances'];
+
+                       $sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;

 
                        if (!$aResult['no-npi'])
                        {
 
                        if (!$aResult['no-npi'])
                        {


@@ -532,7 +540,7 @@ exit;
 
                        if ( CONST_Replication_Update_Interval > 60 )
                        {
 
                        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
                        {
                        }
                        else
                        {