Skip to content

Commit

Permalink
Per @jmchilton comment, rewrite as yml
Browse files Browse the repository at this point in the history
  • Loading branch information
hexylena committed Aug 10, 2017
1 parent 46b6217 commit d7e400c
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 38 deletions.
37 changes: 0 additions & 37 deletions config/error_report.xml.sample

This file was deleted.

34 changes: 34 additions & 0 deletions config/error_report.yml.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Each element in this file corresponds to a destination for an error
# report.

# If you supply the parameter ``user_submission``, and set it to True,
# this error plugin will only be activated when the user uses the bug
# report submission interface. Otherwise, it will be triggered without
# any user interaction (e.g. historical behaviour of sentry plugin)

# If your plugin is ``user_submission=True``, then supplying
# ``verbose=True`` will cause the plugin to display a message to the end
# user. E.g. the email plugin simply states "Your error report has been
# sent", or the JSON plugin informs the user "Wrote error report to ..."

# The plugins below are listed with their default values of
# verbose/user_submission, but those are not necessary to provide.

# The default Email bug reporter. By default, the standard
# configuration is taken from your galaxy.ini
- type: email
verbose: true
user_submission: true

# Example JSON bug reporter implementation. This just writes the bug
# report as a JSON file to a specified directory and serves as an
# example for others to extend.
# - type: json
# verbose: true
# user_submission: true
# directory: /tmp/reports/

# Submit error reports to sentry. If a sentry_dsn is configured in your
# galaxy.ini, then Galaxy will submit the job error to Sentry.
- name: sentry
user_submission: false
2 changes: 1 addition & 1 deletion lib/galaxy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
job_config_file=['config/job_conf.xml', 'job_conf.xml'],
tool_destinations_config_file=['config/tool_destinations.yml', 'config/tool_destinations.yml.sample'],
job_metrics_config_file=['config/job_metrics_conf.xml', 'job_metrics_conf.xml', 'config/job_metrics_conf.xml.sample'],
error_report_file=['config/error_report.xml', 'error_report.xml', 'config/error_report.xml.sample'],
error_report_file=['config/error_report.xml', 'config/error_report.xml.sample'],
dependency_resolvers_config_file=['config/dependency_resolvers_conf.xml', 'dependency_resolvers_conf.xml'],
job_resource_params_file=['config/job_resource_params_conf.xml', 'job_resource_params_conf.xml'],
migrated_tools_config=['migrated_tools_conf.xml', 'config/migrated_tools_conf.xml'],
Expand Down

0 comments on commit d7e400c

Please sign in to comment.