Skip to content

Commit

Permalink
Merge pull request #2025 from matthewrmshin/6.11.x-event-mail-footer
Browse files Browse the repository at this point in the history
Configurable event mail footer
  • Loading branch information
arjclark committed Oct 11, 2016
2 parents 6dce9df + 81a4ab6 commit 29641d7
Show file tree
Hide file tree
Showing 10 changed files with 274 additions and 191 deletions.
2 changes: 2 additions & 0 deletions doc/siterc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,8 @@ \subsection{[cylc]}

\subparagraph[mail events]{[cylc] \textrightarrow [[events]] \textrightarrow mail events}

\subparagraph[mail footer]{[cylc] \textrightarrow [[events]] \textrightarrow mail footer}

\subparagraph[mail from]{[cylc] \textrightarrow [[events]] \textrightarrow mail from}

\subparagraph[mail smtp]{[cylc] \textrightarrow [[events]] \textrightarrow mail smtp}
Expand Down
20 changes: 20 additions & 0 deletions doc/suiterc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,26 @@ \subsection{[cylc]}
\item {\em example:} \lstinline@handler = startup, shutdown, timeout@
\end{myitemize}

\paragraph[mail footer]{[cylc] \textrightarrow [[events]] \textrightarrow mail footer}

Specify a string or string template to insert to footers of notification emails
for both suite events and task events.

A template string may have any or all of these patterns which will be
substituted with actual values:
\begin{myitemize}
\item \%(host)s: suite host name
\item \%(port)s: suite port number
\item \%(owner)s: suite owner name
\item \%(suite)s: suite name
\end{myitemize}

\begin{myitemize}
\item {\em type:}
\item {\em default:} (none)
\item {\em example:} \lstinline@mail footer = see: http://localhost/%(owner)s/notes-on/%(suite)s/@
\end{myitemize}

\paragraph[mail from]{[cylc] \textrightarrow [[events]] \textrightarrow mail from}

Specify an alternate \lstinline=from:= email address for suite event notifications.
Expand Down
1 change: 1 addition & 0 deletions lib/cylc/cfgspec/globalcfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
'mail from': vdr(vtype='string'),
'mail smtp': vdr(vtype='string'),
'mail to': vdr(vtype='string'),
'mail footer': vdr(vtype='string'),
'startup handler': vdr(vtype='string_list', default=[]),
'timeout handler': vdr(vtype='string_list', default=[]),
'inactivity handler': vdr(vtype='string_list', default=[]),
Expand Down
1 change: 1 addition & 0 deletions lib/cylc/cfgspec/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ def _coerce_parameter_list(value, keys, _):
'mail from': vdr(vtype='string'),
'mail smtp': vdr(vtype='string'),
'mail to': vdr(vtype='string'),
'mail footer': vdr(vtype='string'),
},
'simulation mode': {
'disable suite event hooks': vdr(vtype='boolean', default=True),
Expand Down
Loading

0 comments on commit 29641d7

Please sign in to comment.