diff --git a/lib/galaxy/tools/email_templates/errors_dataset.html b/lib/galaxy/tools/email_templates/errors_dataset.html index 3d4e44ef73e2..a8789793d939 100644 --- a/lib/galaxy/tools/email_templates/errors_dataset.html +++ b/lib/galaxy/tools/email_templates/errors_dataset.html @@ -1,66 +1,109 @@ -

Galaxy Tool Error Report

-from ${host} +

Galaxy Tool Error Report

+ + from + + ${host} + + -

Error Localization

- - - - - - -
Dataset${dataset_id} (${dataset_id_encoded})
History${history_id} (${history_id_encoded})
Failed Job${hid}: ${history_item_name} (${hda_id_encoded})
+

Error Localization

+ + + + + + + + + + + + + + + +
Dataset + ${dataset_id} (${dataset_id_encoded}) +
History + ${history_id} (${history_id_encoded}) +
Failed Job${hid}: ${history_item_name} (${hda_id_encoded})
-

User Provided Information

+

User Provided Information

+ The user + ${email_str} + provided the following information: + 
+            ${message}
+
-The user ${email_str} provided the following information: +

Detailed Job Information

+ Job environment and execution information is available at the job + info page. -
-${message}
-
+ + + + + + + + + + + + + + + + + + + + + + + +
Job ID${job_id} (${job_id_encoded})
Tool ID${job_tool_id}
Tool Version${tool_version}
Job PID or DRM id${job_runner_external_id}
Job Tool Version${job_tool_version}
+

Job Execution and Failure Information

+

Command Line

+ 
+            ${job_command_line}
+
-

Detailed Job Information

+

Job stderr

+ 
+            ${job_stderr}
+
-Job environment and execution information is available at the job info page. +

Job stdout

+ 
+            ${job_stdout}
+
- - - - - - - - -
Job ID${job_id} (${job_id_encoded})
Tool ID${job_tool_id}
Tool Version${tool_version}
Job PID or DRM id${job_runner_external_id}
Job Tool Version${job_tool_version}
+

Job Information

+ 
+            ${job_info}
+
-

Job Execution and Failure Information

+

Job Traceback

+ 
+            ${job_traceback}
+
-

Command Line

-
-${job_command_line}
-
+

Tool Execution and Failure Information

+

Tool stderr

+ 
+            ${tool_stderr}
+
-

stderr

-
-${job_stderr}
-
+

Tool stdout

+ 
+            ${tool_stdout}
+
-

stdout

-
-${job_stdout}
-
- -

Job Information

-
-${job_info}
-
- -

Job Traceback

-
-${job_traceback}
-
- -This is an automated message. Do not reply to this address. - + This is an automated message. Do not reply to this address. + + diff --git a/lib/galaxy/tools/email_templates/errors_dataset.txt b/lib/galaxy/tools/email_templates/errors_dataset.txt index d1c90ce1cb0a..05d9669b6d10 100644 --- a/lib/galaxy/tools/email_templates/errors_dataset.txt +++ b/lib/galaxy/tools/email_templates/errors_dataset.txt @@ -41,4 +41,10 @@ ${job_info} job traceback: ${job_traceback} ----------------------------------------------------------------------------- +tool stderr: +${tool_stderr} +----------------------------------------------------------------------------- +tool stdout: +${tool_stdout} +----------------------------------------------------------------------------- (This is an automated message). diff --git a/lib/galaxy/tools/errors.py b/lib/galaxy/tools/errors.py index 32b47f8c1eae..51df260e02c2 100644 --- a/lib/galaxy/tools/errors.py +++ b/lib/galaxy/tools/errors.py @@ -96,10 +96,12 @@ def create_report(self, user, email="", message="", redact_user_details_in_bugre job_tool_version=hda.tool_version, job_runner_external_id=job.job_runner_external_id, job_command_line=job.command_line, - job_stderr=util.unicodify(job.stderr), - job_stdout=util.unicodify(job.stdout), + job_stderr=util.unicodify(job.job_stderr), + job_stdout=util.unicodify(job.job_stdout), job_info=util.unicodify(job.info), job_traceback=util.unicodify(job.traceback), + tool_stderr=util.unicodify(job.tool_stderr), + tool_stdout=util.unicodify(job.tool_stdout), email_str=email_str, message=util.unicodify(message), )