fix branching way problem

[rails.git] / lib / daemons / gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index a74b642cf20fa2121044236b8ea7625acc08b07e..86bd2ac143a43e36eb7867bc90b7da31ffefa672 100755 (executable)
--- 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 = 0 and visible = 1", :order => "id").each do |trace|
     Signal.trap("TERM") do 
       terminated = true
     end
@@ -27,7 +27,7 @@ while(true) do
         Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
       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"))
@@ -38,5 +38,22 @@ while(true) do
     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 5.minutes
 end