X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5620d7263a36fe842f4d97bc21dda5edd0651b37..a16b45eb6a26ad7738e5d919faaf515708507cbf:/lib/daemons/gpx_import.rb?ds=inline diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb index e24dc1ad5..698e858ba 100755 --- 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 = 0 and visible = 1", :order => "id").each do |trace| + 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 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")) + Notifier.gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n")).deliver trace.destroy end @@ -38,7 +38,7 @@ while(true) do exit if terminated end - Trace.find(:all, :conditions => "visible = 0", :order => "id").each do |trace| + Trace.find(:all, :conditions => { :visible => false }, :order => "id").each do |trace| Signal.trap("TERM") do terminated = true end