X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92418b7954d8915734f07a66abf76f52b437a517..82ff8ef58de69c881f63c0a2ef8f9e8a6ae483e0:/lib/daemons/gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 1fc60858a..698e858ba 100755
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -1,56 +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
 
 logger = ActiveRecord::Base.logger
 
-while($running) do
-  
+while(true) do
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
-  traces = Trace.find(:all, :conditions => ['inserted = ?', false])
-
-  if traces and traces.length > 0
-    traces.each do |trace|
-      begin
-
-        logger.info("GPX Import importing #{trace.name} from #{trace.user.email}")
-
-        gzipped = `file -b /tmp/#{trace.id}.gpx`.chomp =~/^gzip/
-
-        if gzipped
-          logger.info("gzipped")
-        else
-          logger.info("not gzipped")
-        end
-        gpx = OSM::GPXImporter.new("/tmp/#{trace.id}.gpx")
-
-        gpx.points do |point|
-          tp = Tracepoint.new
-          tp.latitude = point['latitude']
-          tp.latitude = point['longitude']
-          tp.altitude = point['altitude']
-          tp.user_id = trace.user.id
-          tp.gpx_id = trace.id
-          tp.trackid = point['segment']
-        end 
-        trace.size = gpx.actual_points
-        trace.inserted = true
-        trace.save
-        Notifier::deliver_gpx_success(trace, gpx.possible_points)
-      rescue Exception => ex
+  Trace.find(:all, :conditions => { :inserted => false, :visible => true }, :order => "id").each do |trace|
+    Signal.trap("TERM") do 
+      terminated = true
+    end
+
+    begin
+      gpx = trace.import
+
+      if gpx.actual_points > 0
+        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, ex.to_s)
       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
+    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")
+
+    exit if terminated
   end
-  sleep 15.minutes
+
+  sleep 5.minutes.value
 end