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

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 015a27916..e24dc1ad5 100755
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -1,37 +1,59 @@
 #!/usr/bin/env ruby
 
 #You might want to change this
-ENV["RAILS_ENV"] ||= "development"
+#ENV["RAILS_ENV"] ||= "development"
 
 require File.dirname(__FILE__) + "/../../config/environment"
 
-$running = true;
-Signal.trap("TERM") do 
-  $running = false
-end
+terminated = false
 
-while($running) do
-  
-  ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
+logger = ActiveRecord::Base.logger
 
-  traces = Trace.find(:all, :conditions => ['inserted = ?', false])
+while(true) do
+  ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
-  if traces and traces.length > 0
-    traces.each do |trace|
-      begin
+  Trace.find(:all, :conditions => "inserted = 0 and visible = 1", :order => "id").each do |trace|
+    Signal.trap("TERM") do 
+      terminated = true
+    end
 
-        ActiveRecord::Base.logger.info("GPX Import importing #{trace.name} from #{trace.user.email}")
+    begin
+      gpx = trace.import
 
-        #  gpx = OSM::GPXImporter.new('/tmp/2.gpx')
-        #  gpx.points do |point|
-        #    puts point['latitude']
-        #  end
-        
-        Notifier::deliver_gpx_success(trace)
-      rescue
-        Notifier::deliver_gpx_failure(trace)
+      if gpx.actual_points > 0
+        Notifier::deliver_gpx_success(trace, gpx.actual_points)
+      else
+        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 }
+      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 = 0", :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")
+
+    exit if terminated
   end
-  sleep 15.minutes
+
+  sleep 5.minutes.value
 end