dulcy: switch to postgresql 12

[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 8345205cb74099bf3baae9b42cdf8717efa4aed0..ade5845aa6fda850f5d16801cef83c1afb012d3e 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -6,13 +6,12 @@
 cd <%= @bindir %>
 
 num_cpus=`cat /proc/cpuinfo | grep -c processor`
 cd <%= @bindir %>
 
 num_cpus=`cat /proc/cpuinfo | grep -c processor`

-num_cpus=(($num_cpus - 2))
+num_cpus=$((num_cpus - 2))

 
 while [ ! -f "<%= @update_stop_file %>" ]
 do
     # Send output to the log (logrotatable)
     exec >> <%= @logfile %> 2>&1
 
 while [ ! -f "<%= @update_stop_file %>" ]
 do
     # Send output to the log (logrotatable)
     exec >> <%= @logfile %> 2>&1

-    starttime=`date +%s`

 
     current_load=`cat /proc/loadavg | cut -f 2 -d ' ' | sed 's:\..*::'`
 
 
     current_load=`cat /proc/loadavg | cut -f 2 -d ' ' | sed 's:\..*::'`
 


@@ -23,7 +22,7 @@ do
         INST=1
     fi
 
         INST=1
     fi
 

-    ./utils/update.php --no-npi --import-osmosis --index-instances $INST
+    ./utils/update.php --import-osmosis --index-instances $INST

 
 <% if node[:nominatim][:enable_git_updates] -%>
     pushd <%= @srcdir %>
 
 <% if node[:nominatim][:enable_git_updates] -%>
     pushd <%= @srcdir %>


@@ -36,13 +35,8 @@ do
     popd
 <% end -%>
 
     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 %>
+        ./utils/update.php --calculate-postcodes

     fi
 done
     fi
 done