From 7ca4de12d7e951f6a80e6d40369b878a4abbc41a Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 3 Jan 2016 22:13:01 -0600 Subject: [PATCH] * email alert --- ruby/lib/jam_ruby/app/mailers/admin_mailer.rb | 8 ++++++++ ruby/spec/support/utilities.rb | 4 ++++ web/app/controllers/api_users_controller.rb | 6 ++++++ web/config/application.rb | 1 + web/config/environments/development.rb | 1 + 5 files changed, 20 insertions(+) diff --git a/ruby/lib/jam_ruby/app/mailers/admin_mailer.rb b/ruby/lib/jam_ruby/app/mailers/admin_mailer.rb index abe1b9564..f1c4e92f0 100644 --- a/ruby/lib/jam_ruby/app/mailers/admin_mailer.rb +++ b/ruby/lib/jam_ruby/app/mailers/admin_mailer.rb @@ -20,6 +20,14 @@ module JamRuby subject: options[:subject]) end + def crash_alert(options) + mail(to: APP_CONFIG.email_crashes_alias, + from: APP_CONFIG.email_generic_from, + body: options[:body], + content_type: "text/plain", + subject: options[:subject]) + end + def social(options) mail(to: APP_CONFIG.email_social_alias, from: APP_CONFIG.email_generic_from, diff --git a/ruby/spec/support/utilities.rb b/ruby/spec/support/utilities.rb index 425d40a2f..abe518a98 100644 --- a/ruby/spec/support/utilities.rb +++ b/ruby/spec/support/utilities.rb @@ -15,6 +15,10 @@ def app_config 'alerts@jamkazam.com' end + def email_crashes_alias + 'clientcrash@jamkazam.com' + end + def email_recurly_notice 'recurly-alerts@jamkazam.com' end diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb index e664e4697..dde826090 100644 --- a/web/app/controllers/api_users_controller.rb +++ b/web/app/controllers/api_users_controller.rb @@ -626,6 +626,12 @@ ApiUsersController < ApiController logger.debug("crash_dump can read from url #{read_url}") + body = "Client crash for user #{current_user.email} (#{current_user.name})\n" + body << "Client type: #{@dump.client_type}" + body << "Client version: #{@dump.client_version}" + body << "Download at: #{read_url}\n" + body << "User admin url: #{current_user.admin_url}" + AdminMailer.crash_alert(subject: "Crash for #{@dump.client_type} #{current_user.email} (#{current_user.name})", body:body) redirect_to write_url, status: 307 else # we should store it here to aid in development, but we don't have to until someone wants the feature diff --git a/web/config/application.rb b/web/config/application.rb index 7428e6d5c..16d06931b 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -240,6 +240,7 @@ if defined?(Bundler) config.num_packaging_nodes = 2 config.email_social_alias = 'social@jamkazam.com' + config.email_crashes_alias = 'clientcrash@jamkazam.com' config.email_alerts_alias = 'alerts@jamkazam.com' # should be used for 'oh no' server down/service down sorts of emails config.email_generic_from = 'nobody@jamkazam.com' config.email_recurly_notice = 'recurly-alerts@jamkazam.com' diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb index fdfbb2d01..4601ce003 100644 --- a/web/config/environments/development.rb +++ b/web/config/environments/development.rb @@ -95,6 +95,7 @@ SampleApp::Application.configure do config.video_available= ENV['VIDEO_AVAILABILITY'] || "full" config.email_generic_from = 'nobody-dev@jamkazam.com' config.email_alerts_alias = ENV['ALERT_EMAIL'] || 'alerts-dev@jamkazam.com' + config.email_crashes_alias = ENV['ALERT_EMAIL'] || 'clientcrash@jamkazam.com' config.email_social_alias = ENV['ALERT_EMAIL'] || 'social-dev@jamkazam.com' config.guard_against_fraud = true config.guard_against_browser_fraud = false