X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7d41f09eb65c2a84fb612b476395826d198d0d9..bdee581d440ba0d88e7e07355ffa3175ea9691d3:/lib/daemons/gpx_import.rb?ds=inline

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index f597c8795..8250a67f5 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 = ?', false]).each do |trace|
+  Trace.find(:all, :conditions => { :inserted => false, :visible => true }, :order => "id").each do |trace|
     Signal.trap("TERM") do 
       terminated = true
     end
@@ -23,14 +23,31 @@ 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
+      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")
+
+    exit if terminated
+  end
+
+  Trace.find(:all, :conditions => { :visible => false }, :order => "id").each do |trace|
+    Signal.trap("TERM") do 
+      terminated = true
+    end
+
+    begin
+      trace.destroy
+    rescue Exception => ex
+      logger.info ex.to_s
+      ex.backtrace.each {|l| logger.info l }
     end
 
     Signal.trap("TERM", "DEFAULT")
@@ -38,5 +55,5 @@ while(true) do
     exit if terminated
   end
 
-  sleep 15.minutes
+  sleep 5.minutes.value
 end