Revert r1154 and instead apply the patch in cache_acls so that an error is

[invirt/packages/invirt-web.git] / code / main.py

diff --git a/code/main.py b/code/main.py
index bf25c26..e4727a8 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -653,7 +653,8 @@ def show_error(op, username, fields, err, emsg, traceback):
     d = dict(op=op, user=username, fields=fields,
              errorMessage=str(err), stderr=emsg, traceback=traceback)
     details = templates.error_raw(searchList=[d])
     d = dict(op=op, user=username, fields=fields,
              errorMessage=str(err), stderr=emsg, traceback=traceback)
     details = templates.error_raw(searchList=[d])

-    if False: #username not in config.web.errormail_exclude:
+    exclude = config.web.errormail_exclude
+    if username not in exclude and '*' not in exclude:

         send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
                         details)
     d['details'] = details
         send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
                         details)
     d['details'] = details