X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f667d26c54fa043489d1f37b9617f937cfb04bfc..e45031ca0ddc8f9b7b9a7bae381650b3c9309a23:/cookbooks/nominatim/templates/default/updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index 7443297e8..ade5845aa 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -2,29 +2,41 @@
 
 # DO NOT EDIT - This file is being maintained by Chef
 
-# Send output to the log
-exec > /var/log/nominatim/update.log 2>&1
-
 # Change to Nominatim directory
-DIR="$( cd "$( dirname "$0" )" && pwd )"
-cd $DIR/..
+cd <%= @bindir %>
 
-while true
-do
-    starttime=`date +%s`
+num_cpus=`cat /proc/cpuinfo | grep -c processor`
+num_cpus=$((num_cpus - 2))
 
-    ./utils/update.php --no-npi --import-osmosis
+while [ ! -f "<%= @update_stop_file %>" ]
+do
+    # Send output to the log (logrotatable)
+    exec >> <%= @logfile %> 2>&1
 
-    # will trigger recompilation if necessary
-    git pull
+    current_load=`cat /proc/loadavg | cut -f 2 -d ' ' | sed 's:\..*::'`
 
-    # sleep a bit if updates take less than a minute
-    endtime=`date +%s`
-    elapsed=$((endtime - starttime))
-    if [[ $elapsed -lt 60 ]]
+    if [[ $current_load -lt $num_cpus ]]
     then
-        sleepy=$((60 - $elapsed))
-        echo "Sleeping for ${sleepy}s..."
-        sleep $sleepy
+        INST=2
+    else
+        INST=1
+    fi
+
+    ./utils/update.php --import-osmosis --index-instances $INST
+
+<% if node[:nominatim][:enable_git_updates] -%>
+    pushd <%= @srcdir %>
+    if git fetch origin; then
+      # will trigger recompilation if necessary
+      git merge origin/<%= @branch %>
+    else
+      echo "WARNING: git fetch failed."
+    fi
+    popd
+<% end -%>
+
+    if [ -f "<%= @update_maintenance_trigger %>" ]; then
+        rm <%= @update_maintenance_trigger %>
+        ./utils/update.php --calculate-postcodes
     fi
 done