X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6131b08d957d6808a57ba6647e5e60a057ee1e5a..6225dc532401d762c78b4b296c8c0720913142bd:/cookbooks/nominatim/templates/default/updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index 2f75b4199..8345205cb 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -2,25 +2,39 @@
 
 # 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 %>
+
+num_cpus=`cat /proc/cpuinfo | grep -c processor`
+num_cpus=(($num_cpus - 2))
 
-while true
+while [ ! -f "<%= @update_stop_file %>" ]
 do
+    # Send output to the log (logrotatable)
+    exec >> <%= @logfile %> 2>&1
     starttime=`date +%s`
 
-    ./utils/update.php --no-npi --import-osmosis
+    current_load=`cat /proc/loadavg | cut -f 2 -d ' ' | sed 's:\..*::'`
+
+    if [[ $current_load -lt $num_cpus ]]
+    then
+        INST=2
+    else
+        INST=1
+    fi
+
+    ./utils/update.php --no-npi --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/master
+      git merge origin/<%= @branch %>
     else
       echo "WARNING: git fetch failed."
     fi
+    popd
+<% end -%>
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`