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.

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index 7e4af3a3047c34dfec404932410830f16150b0fe..d5ba2e0bec89e9653b881f3819c76c7017f3b9b4 100644 (file)
--- 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
 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 %>


@@ -35,14 +34,4 @@ do
     fi
     popd
 <% end -%>
     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
 done