From a6f0a90f05a91a3724c31184c056fd868dc94dce Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 11 Jun 2017 09:34:30 +0200 Subject: [PATCH] nominatim: remove sleep from update script Nominatim's own update.php now properly takes care of sleeping for the approriate time even when in single-update mode. --- cookbooks/nominatim/templates/default/updater.erb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index 7e4af3a30..d5ba2e0be 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 %> @@ -35,14 +34,4 @@ do 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 - fi done -- 2.43.2