From 93ebbbb65f515645b09f2885a85a5a8d9d16ae34 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 24 Nov 2010 17:13:17 -0500
Subject: [PATCH] put some logging in the mailer
---
app/mailers/notifier.rb | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index c624470d26..b9f21f89f2 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -8,8 +8,10 @@ class Notifier < ActionMailer::Base
@receiver = User.find_by_id(recipient_id)
@sender = Person.find_by_id(sender_id)
+ log_mail(recipient_id, sender_id, 'new_request')
+
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
-
+
mail(:to => "#{@receiver.real_name} <#{@receiver.email}>",
:subject => I18n.t('notifier.new_request.subject', :from => @sender.real_name), :host => APP_CONFIG[:terse_pod_url])
end
@@ -18,9 +20,23 @@ class Notifier < ActionMailer::Base
@receiver = User.find_by_id(recipient_id)
@sender = Person.find_by_id(sender_id)
@aspect = Aspect.find_by_id(aspect_id)
+
+ log_mail(recipient_id, sender_id, 'request_accepted')
+
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
mail(:to => "#{@receiver.real_name} <#{@receiver.email}>",
:subject => I18n.t('notifier.request_accepted.subject', :name => @sender.real_name), :host => APP_CONFIG[:terse_pod_url])
end
+
+ private
+ def log_mail recipient_id, sender_id, type
+ log_string = "event=mail mail_type=#{type} db_name=#{MongoMapper.database.name} recipient_id=#{recipient_id} sender_id=#{sender_id}"
+ if @receiver && @sender
+ log_string << "models_found=true sender_handle=#{@sender.diaspora_handle} recipient_handle=#{@receiver.diaspora_handle}"
+ else
+ log_string << "models_found=false"
+ end
+ Rails.logger.info log_string
+ end
end
--
GitLab