nominatim: be a bit more lenient before banning

[chef.git] / cookbooks / nominatim / templates / default / updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index d839e6bb49aae685349dee18c40cc0b2d71c9d1c..37cf8937291828771e9012f789a84cd791ee04da 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -3,31 +3,40 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Change to Nominatim directory
 # DO NOT EDIT - This file is being maintained by Chef
 
 # 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 [ ! -f "<%= @update_stop_file %>" ]
 do
     # Send output to the log (logrotatable)
 
 while [ ! -f "<%= @update_stop_file %>" ]
 do
     # Send output to the log (logrotatable)

-    exec >> <%= @logfile %>/update.log 2>&1
-    starttime=`date +%s`
+    exec >> <%= @logfile %> 2>&1

 
 

-    ./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=4
+    else
+        INST=2
+    fi
+
+    ./nominatim replication --once --threads $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
     if git fetch origin; then
       # will trigger recompilation if necessary
       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`
-    elapsed=$((endtime - starttime))
-    if [[ $elapsed -lt 60 ]]
-    then
-        sleepy=$((60 - $elapsed))
-        echo "Sleeping for ${sleepy}s..."
-        sleep $sleepy
+    if [ -f "<%= @update_maintenance_trigger %>" ]; then
+        rm <%= @update_maintenance_trigger %>
+        ./nominatim refresh --postcodes

     fi
 done
     fi
 done