opendev/storyboard
Code Issues Proposed changes

Merge "Add a configurable fallback URL for emails"

Browse Source
This commit is contained in:
Jenkins 2017-08-23 21:41:34 +00:00 committed by Gerrit Code Review
commit d8316e0c45
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/storyboard.conf.sample
View File

@ -168,6 +168,9 @@ lock_path = $state_path/lock
# The email address of the Reply-To header (optional). # The email address of the Reply-To header (optional).
# reply_to = # reply_to =
# The default url base to use in emails, if Referer is not set.
# default_url = https://storyboard.openstack.org/
# The SMTP server to use. # The SMTP server to use.
# smtp_host = localhost # smtp_host = localhost

3
storyboard/plugin/email/__init__.py
View File

@ -33,6 +33,9 @@ PLUGIN_OPTS = [
cfg.StrOpt("reply_to", cfg.StrOpt("reply_to",
default=None, default=None,
help="The email address of the Reply-To header (optional)."), help="The email address of the Reply-To header (optional)."),
cfg.StrOpt("default_url",
default=None,
help="The default/fallback url base to use in emails."),
cfg.StrOpt("smtp_host", cfg.StrOpt("smtp_host",
default='localhost', default='localhost',
help="The SMTP server to use."), help="The SMTP server to use."),

4
storyboard/plugin/email/workers.py
View File

@ -282,6 +282,10 @@ class SubscriptionEmailWorker(EmailWorkerBase):
if email_config.reply_to: if email_config.reply_to:
factory.add_header('Reply-To', email_config.reply_to) factory.add_header('Reply-To', email_config.reply_to)
# If there is a fallback URL configured, use it if needed
if email_config.default_url and url is None:
url = email_config.default_url
# Resolve the resource instance # Resolve the resource instance
resource_instance = self.resolve_resource_by_name(session, resource, resource_instance = self.resolve_resource_by_name(session, resource,
resource_id) resource_id)