Include tags in GPX success and failure mails. Closes #480.
This commit is contained in:
parent
d47196254c
commit
7d0a281d5b
5 changed files with 22 additions and 14 deletions
|
@ -35,6 +35,8 @@ class Notifier < ActionMailer::Base
|
|||
headers "Auto-Submitted" => "auto-generated"
|
||||
body :trace_name => trace.name,
|
||||
:trace_points => trace.size,
|
||||
:trace_description => trace.description,
|
||||
:trace_tags => trace.tags,
|
||||
:possible_points => possible_points
|
||||
end
|
||||
|
||||
|
@ -44,6 +46,8 @@ class Notifier < ActionMailer::Base
|
|||
subject "[OpenStreetMap] GPX Import failure"
|
||||
headers "Auto-Submitted" => "auto-generated"
|
||||
body :trace_name => trace.name,
|
||||
:trace_description => trace.description,
|
||||
:trace_tags => trace.tags,
|
||||
:error => error
|
||||
end
|
||||
|
||||
|
|
14
app/views/notifier/_gpx_description.rhtml
Normal file
14
app/views/notifier/_gpx_description.rhtml
Normal file
|
@ -0,0 +1,14 @@
|
|||
Hi,
|
||||
|
||||
It looks like your GPX file
|
||||
|
||||
<%= @trace_name %>
|
||||
|
||||
with the description
|
||||
|
||||
<%= @trace_description %>
|
||||
<% if @trace_tags.length>0 %>
|
||||
and the following tags:
|
||||
<% @trace_tags.each do |tag| %>
|
||||
<%= tag.tag.rstrip %><% end %><% else %>
|
||||
and no tags.<% end %>
|
|
@ -1,9 +1,4 @@
|
|||
Hi,
|
||||
|
||||
It looks like your GPX file
|
||||
|
||||
<%= @trace_name %>
|
||||
|
||||
<%= render :partial => "gpx_description" %>
|
||||
failed to import. Here's the error:
|
||||
|
||||
<%= @error %>
|
||||
|
|
|
@ -1,8 +1,3 @@
|
|||
Hi,
|
||||
|
||||
It looks like your GPX file
|
||||
|
||||
<%= @trace_name %>
|
||||
|
||||
<%= render :partial => "gpx_description" %>
|
||||
loaded successfully with <%= @trace_points %> out of a possible
|
||||
<%= @possible_points %> points.
|
||||
|
|
|
@ -23,14 +23,14 @@ while(true) do
|
|||
if gpx.actual_points > 0
|
||||
Notifier::deliver_gpx_success(trace, gpx.actual_points)
|
||||
else
|
||||
trace.destroy
|
||||
Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
|
||||
trace.destroy
|
||||
end
|
||||
rescue Exception => ex
|
||||
logger.info ex.to_s
|
||||
ex.backtrace.each {|l| logger.info l }
|
||||
trace.destroy
|
||||
Notifier::deliver_gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n"))
|
||||
trace.destroy
|
||||
end
|
||||
|
||||
Signal.trap("TERM", "DEFAULT")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue