X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d274c0e3d8176f2e4da7ecc24c6247253c9f07f1..b946779b845b298639c99e92407e8200d66814c1:/lib/daemons/gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index e80a51944..e24dc1ad5 100755
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -12,7 +12,7 @@ logger = ActiveRecord::Base.logger
 while(true) do
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
-  Trace.find(:all, :conditions => 'inserted = 0').each do |trace|
+  Trace.find(:all, :conditions => "inserted = 0 and visible = 1", :order => "id").each do |trace|
     Signal.trap("TERM") do 
       terminated = true
     end
@@ -23,14 +23,14 @@ while(true) do
       if gpx.actual_points > 0
         Notifier::deliver_gpx_success(trace, gpx.actual_points)
       else
-        trace.destroy
         Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
+        trace.destroy
       end
     rescue Exception => ex
       logger.info ex.to_s
       ex.backtrace.each {|l| logger.info l }
-      trace.destroy
       Notifier::deliver_gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n"))
+      trace.destroy
     end
 
     Signal.trap("TERM", "DEFAULT")
@@ -38,7 +38,7 @@ while(true) do
     exit if terminated
   end
 
-  Trace.find(:all, :conditions => 'visible = 0').each do |trace|
+  Trace.find(:all, :conditions => "visible = 0", :order => "id").each do |trace|
     Signal.trap("TERM") do 
       terminated = true
     end
@@ -55,5 +55,5 @@ while(true) do
     exit if terminated
   end
 
-  sleep 5.minutes
+  sleep 5.minutes.value
 end