X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c11a8ec4f62df07c06315f45a914602fb2818cc2..b0e841d7ff50e5c5bea3a3417737c272b09dcd86:/cookbooks/nominatim/templates/default/updater.erb diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index 7e4af3a30..ade5845aa 100644 --- a/cookbooks/nominatim/templates/default/updater.erb +++ b/cookbooks/nominatim/templates/default/updater.erb @@ -12,7 +12,6 @@ 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:\..*::'` @@ -23,7 +22,7 @@ do 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 %> @@ -36,13 +35,8 @@ do 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