all details in email too, still just for CodeError

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

diff --git a/code/main.py b/code/main.py
index 01d6e39..dd6b867 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -119,11 +119,12 @@ DEFAULT_HEADERS = {'Content-Type': 'text/html'}
 
 def error(op, username, fields, err, emsg, traceback):
     """Print an error page when a CodeError occurs"""
 
 def error(op, username, fields, err, emsg, traceback):
     """Print an error page when a CodeError occurs"""

-    send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
-                    'error on %s for %s: %s\n\n%s\n'
-                    % (op, username, err, emsg))

     d = dict(op=op, user=username, fields=fields,
              errorMessage=str(err), stderr=emsg, traceback=traceback)
     d = dict(op=op, user=username, fields=fields,
              errorMessage=str(err), stderr=emsg, traceback=traceback)

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

     return templates.error(searchList=[d])
 
 def invalidInput(op, username, fields, err, emsg):
     return templates.error(searchList=[d])
 
 def invalidInput(op, username, fields, err, emsg):