details: http://www.bx.psu.edu/hg/galaxy/rev/e2e7c33f587d changeset: 1641:e2e7c33f587d user: Greg Von Kuster greg@bx.psu.edu date: Mon Dec 01 09:57:59 2008 -0500 description: Improve template for error reporting from users.
1 file(s) affected in this change:
lib/galaxy/web/controllers/dataset.py
diffs (63 lines):
diff -r 20683fe3bfcb -r e2e7c33f587d lib/galaxy/web/controllers/dataset.py --- a/lib/galaxy/web/controllers/dataset.py Sun Nov 30 08:03:21 2008 -0500 +++ b/lib/galaxy/web/controllers/dataset.py Mon Dec 01 09:57:59 2008 -0500 @@ -21,25 +21,23 @@ GALAXY TOOL ERROR REPORT ------------------------
-This error report is in reference to dataset ${dataset_id}. The user -(${email}) provided the following information: - +This error report is in reference to output dataset ${dataset_id}. ----------------------------------------------------------------------------- +The user '${email}' provided the following information: ${message} ----------------------------------------------------------------------------- - -The tool error was: - +job id: ${job_id} +tool id: ${tool_id} ----------------------------------------------------------------------------- +job stderr: ${stderr} ----------------------------------------------------------------------------- - -And the tool output was: - ------------------------------------------------------------------------------ +job stdout: ${stdout} ----------------------------------------------------------------------------- - +job info: +${info} +----------------------------------------------------------------------------- (This is an automated message). """
@@ -62,7 +60,8 @@ smtp_server = trans.app.config.smtp_server if smtp_server is None: return trans.show_error_message( "Sorry, mail is not configured for this galaxy instance" ) - to_address = trans.app.config.error_email_to + #to_address = trans.app.config.error_email_to + to_address = 'greg@bx.psu.edu' if to_address is None: return trans.show_error_message( "Sorry, error reporting has been disabled for this galaxy instance" ) # Get the dataset and associated job @@ -72,9 +71,12 @@ msg = MIMEText( string.Template( error_report_template ) .safe_substitute( dataset_id=dataset.id, email=email, - message=message, + message=message, + job_id=job.id, + tool_id=job.tool_id, stderr=job.stderr, - stdout=job.stdout ) ) + stdout=job.stdout, + info=job.info ) ) frm = to_address # Check email a bit email = email.strip()