X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4f26daaa10a4cfa1bf5959d61db4f59dde6f3163..9bc3196deeea09bc4d209d7706ddedd33f99f424:/lib/daemons/gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 793fde94b..698e858ba 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 and visible = 1').each do |trace|
+  Trace.find(:all, :conditions => { :inserted => false, :visible => true }, :order => "id").each do |trace|
     Signal.trap("TERM") do 
       terminated = true
     end
@@ -21,16 +21,16 @@ while(true) do
       gpx = trace.import
 
       if gpx.actual_points > 0
-        Notifier::deliver_gpx_success(trace, gpx.actual_points)
+        Notifier.gpx_success(trace, gpx.actual_points).deliver
       else
+        Notifier.gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?').deliver
         trace.destroy
-        Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
       end
     rescue Exception => ex
       logger.info ex.to_s
       ex.backtrace.each {|l| logger.info l }
+      Notifier.gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n")).deliver
       trace.destroy
-      Notifier::deliver_gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n"))
     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 => false }, :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