Merge remote-tracking branch 'openstreetmap/pull/1553'

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

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 07f4cd6a4c4e8fade28e1cf9c0aec65198d389f4..4445d1ec081aaefcd5ff193f95daf3384728d56e 100755 (executable)
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #!/usr/bin/env ruby
 

-#You might want to change this
-#ENV["RAILS_ENV"] ||= "development"
+# You might want to change this
+# ENV["RAILS_ENV"] ||= "development"

 
 require File.dirname(__FILE__) + "/../../config/environment"
 
 
 require File.dirname(__FILE__) + "/../../config/environment"
 


@@ -9,11 +9,11 @@ terminated = false
 
 logger = ActiveRecord::Base.logger
 
 
 logger = ActiveRecord::Base.logger
 

-while(true) do
+loop do

   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 

-  Trace.find(:all, :conditions => "inserted = 0 and visible = 1", :order => "id").each do |trace|
-    Signal.trap("TERM") do 
+  Trace.find(:all, :conditions => { :inserted => false, :visible => true }, :order => "id").each do |trace|
+    Signal.trap("TERM") do

       terminated = true
     end
 
       terminated = true
     end
 


@@ -21,16 +21,16 @@ while(true) do
       gpx = trace.import
 
       if gpx.actual_points > 0
       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
       else

+        Notifier.gpx_failure(trace, "0 points parsed ok. Do they all have lat,lng,alt,timestamp?").deliver

         trace.destroy
         trace.destroy

-        Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')

       end
       end

-    rescue Exception => ex
+    rescue StandardError => ex

       logger.info ex.to_s
       logger.info ex.to_s

-      ex.backtrace.each {|l| logger.info l }
+      ex.backtrace.each { |l| logger.info l }
+      Notifier.gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n")).deliver

       trace.destroy
       trace.destroy

-      Notifier::deliver_gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n"))

     end
 
     Signal.trap("TERM", "DEFAULT")
     end
 
     Signal.trap("TERM", "DEFAULT")


@@ -38,16 +38,16 @@ while(true) do
     exit if terminated
   end
 
     exit if terminated
   end
 

-  Trace.find(:all, :conditions => "visible = 0", :order => "id").each do |trace|
-    Signal.trap("TERM") do 
+  Trace.find(:all, :conditions => { :visible => false }, :order => "id").each do |trace|
+    Signal.trap("TERM") do

       terminated = true
     end
 
     begin
       trace.destroy
       terminated = true
     end
 
     begin
       trace.destroy

-    rescue Exception => ex
+    rescue StandardError => ex

       logger.info ex.to_s
       logger.info ex.to_s

-      ex.backtrace.each {|l| logger.info l }
+      ex.backtrace.each { |l| logger.info l }

     end
 
     Signal.trap("TERM", "DEFAULT")
     end
 
     Signal.trap("TERM", "DEFAULT")