X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5620d7263a36fe842f4d97bc21dda5edd0651b37..4e64291839d45a0c660fc84f11a6c4c811cf8f21:/lib/daemons/gpx_import.rb diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb index e24dc1ad5..4445d1ec0 100755 --- a/lib/daemons/gpx_import.rb +++ b/lib/daemons/gpx_import.rb @@ -1,7 +1,7 @@ #!/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" @@ -9,11 +9,11 @@ terminated = false logger = ActiveRecord::Base.logger -while(true) do +loop do 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 @@ -21,15 +21,15 @@ while(true) do 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 - Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?') + Notifier.gpx_failure(trace, "0 points parsed ok. Do they all have lat,lng,alt,timestamp?").deliver trace.destroy end - rescue Exception => ex + rescue StandardError => 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")) + ex.backtrace.each { |l| logger.info l } + Notifier.gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n")).deliver trace.destroy end @@ -38,16 +38,16 @@ while(true) do 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 - rescue Exception => ex + rescue StandardError => ex logger.info ex.to_s - ex.backtrace.each {|l| logger.info l } + ex.backtrace.each { |l| logger.info l } end Signal.trap("TERM", "DEFAULT")