From 3a11db03ebb0850200c45522ea0dfbeeb41ee96f Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 22 2017 20:37:00 +0000
Subject: Enable error emailing from the workers


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/pagure/mail_logging.py b/pagure/mail_logging.py
index 32bbb9d..c1b7f95 100644
--- a/pagure/mail_logging.py
+++ b/pagure/mail_logging.py
@@ -88,20 +88,27 @@ class ContextInjector(logging.Filter):  # pragma: no cover
 
         record.callstack = self.format_callstack()
 
-        record.url = getattr(flask.request, 'url', '-')
-        record.args = getattr(flask.request, 'args', '-')
-        record.form = '-'
-        record.username = '-'
         try:
-            record.form = dict(flask.request.form)
-            if 'csrf_token' in record.form:
-                record.form['csrf_token'] = 'Was present, is cleaned up'
+            record.url = getattr(flask.request, 'url', '-')
+            record.args = getattr(flask.request, 'args', '-')
+            record.form = '-'
+            record.username = '-'
+            try:
+                record.form = dict(flask.request.form)
+                if 'csrf_token' in record.form:
+                    record.form['csrf_token'] = 'Was present, is cleaned up'
+            except RuntimeError:
+                pass
+            try:
+                record.username = flask.g.fas_user.username
+            except:
+                pass
         except RuntimeError:
-            pass
-        try:
-            record.username = flask.g.fas_user.username
-        except:
-            pass
+            # This means we are sending an error email from the worker
+            record.url = '* Worker *'
+            record.args = ''
+            record.form = '-'
+            record.username = '-'
 
         return True