Bump cookstyle from 7.21.0 to 7.22.3

[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 2c553ad21372ea0640a767493e63ccd19f65ce95..cfa5de79b60e4d4eb127dbde9ae6bd41dd6a76c0 100644 (file)
--- 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
 
 
 # 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
 # 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 < 60 ]]
+    if [[ $current_load -lt $num_cpus ]]

     then
     then

-        sleepy=$((60 - $elapsed))
-        echo "Sleeping for ${sleepy}s..."
-        sleep $sleepy
+        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
+    popd
+<% end -%>
+
+    if [ -f "<%= @update_maintenance_trigger %>" ]; then
+        rm <%= @update_maintenance_trigger %>
+        ./nominatim refresh --postcodes --threads 4 -v

     fi
 done
     fi
 done