Merge remote-tracking branch 'upstream/pull/1895'

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

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 698e858ba375c27cf1d592bdf8e84617d371af6c..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}.")
 
   Trace.find(:all, :conditions => { :inserted => false, :visible => true }, :order => "id").each do |trace|
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
   Trace.find(:all, :conditions => { :inserted => false, :visible => true }, :order => "id").each do |trace|

-    Signal.trap("TERM") do 
+    Signal.trap("TERM") do

       terminated = true
     end
 
       terminated = true
     end
 


@@ -23,12 +23,12 @@ while(true) do
       if gpx.actual_points > 0
         Notifier.gpx_success(trace, gpx.actual_points).deliver
       else
       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
+        Notifier.gpx_failure(trace, "0 points parsed ok. Do they all have lat,lng,alt,timestamp?").deliver

         trace.destroy
       end
         trace.destroy
       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
     end
       Notifier.gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n")).deliver
       trace.destroy
     end


@@ -39,15 +39,15 @@ while(true) do
   end
 
   Trace.find(:all, :conditions => { :visible => false }, :order => "id").each do |trace|
   end
 
   Trace.find(:all, :conditions => { :visible => false }, :order => "id").each do |trace|

-    Signal.trap("TERM") do 
+    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")