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

[rails.git] / app / jobs / trace_importer_job.rb

diff --git a/app/jobs/trace_importer_job.rb b/app/jobs/trace_importer_job.rb
index 1eddcb6f8e8e50d40f20fac1e6f470ff8518edb3..48285cbc1ebd60273f108cdf526f8eba5e7a6b8c 100644 (file)
--- a/app/jobs/trace_importer_job.rb
+++ b/app/jobs/trace_importer_job.rb
@@ -10,10 +10,14 @@ class TraceImporterJob < ApplicationJob
       UserMailer.gpx_failure(trace, "0 points parsed ok. Do they all have lat,lng,alt,timestamp?").deliver
       trace.destroy
     end
       UserMailer.gpx_failure(trace, "0 points parsed ok. Do they all have lat,lng,alt,timestamp?").deliver
       trace.destroy
     end

+  rescue XML::Error => e
+    logger.info e.to_s
+    UserMailer.gpx_failure(trace, e).deliver
+    trace.destroy

   rescue StandardError => e
     logger.info e.to_s
     e.backtrace.each { |l| logger.info l }
   rescue StandardError => e
     logger.info e.to_s
     e.backtrace.each { |l| logger.info l }

-    UserMailer.gpx_failure(trace, e.to_s + "\n" + e.backtrace.join("\n")).deliver
+    UserMailer.gpx_failure(trace, "#{e}\n#{e.backtrace.join("\n")}").deliver

     trace.destroy
   end
 end
     trace.destroy
   end
 end