Merge pull request #13390 from edx/aj/improve-registration-activation-logging

Aj/improve registration activation logging

common/djangoapps/student/models.py

@@ -545,6 +545,7 @@ class Registration(models.Model):
         self.user.is_active = True
         self._track_activation()
         self.user.save()
+        log.info(u'User %s (%s) account is successfully activated.', self.user.username, self.user.email)
 
     def _track_activation(self):
         """ Update the isActive flag in mailchimp for activated users."""

common/djangoapps/student/views.py

@@ -2282,16 +2282,15 @@ def reactivation_email_for_user(user):
     subject = render_to_string('emails/activation_email_subject.txt', context)
     subject = ''.join(subject.splitlines())
     message = render_to_string('emails/activation_email.txt', context)
+    from_address = configuration_helpers.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL)
 
     try:
-        user.email_user(subject, message, configuration_helpers.get_value(
-            'email_from_address',
-            settings.DEFAULT_FROM_EMAIL,
-        ))
+        user.email_user(subject, message, from_address)
     except Exception:  # pylint: disable=broad-except
         log.error(
-            u'Unable to send reactivation email from "%s"',
-            configuration_helpers.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL),
+            u'Unable to send reactivation email from "%s" to "%s"',
+            from_address,
+            user.email,
             exc_info=True
         )
         return JsonResponse({