From c274d8ca000f8ede0dcc3399abd1d35e09355ae6 Mon Sep 17 00:00:00 2001 From: J08nY Date: Tue, 30 May 2017 21:10:52 +0200 Subject: Move pipelines to their own package, instantiate them dynamically. --- src/mailman/core/pipelines.py | 81 ++----------------------------------------- 1 file changed, 2 insertions(+), 79 deletions(-) (limited to 'src/mailman/core/pipelines.py') diff --git a/src/mailman/core/pipelines.py b/src/mailman/core/pipelines.py index 15e23a022..df07bc608 100644 --- a/src/mailman/core/pipelines.py +++ b/src/mailman/core/pipelines.py @@ -15,19 +15,17 @@ # You should have received a copy of the GNU General Public License along with # GNU Mailman. If not, see . -"""Built-in pipelines.""" +"""Application support for pipeline processing.""" import logging from mailman.app.bounces import bounce_message from mailman.config import config -from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.interfaces.pipeline import ( DiscardMessage, IPipeline, RejectMessage) from mailman.utilities.modules import add_components from public import public -from zope.interface import implementer dlog = logging.getLogger('mailman.debug') @@ -61,85 +59,10 @@ def process(mlist, msg, msgdata, pipeline_name='built-in'): bounce_message(mlist, msg, error) -@public -@implementer(IPipeline) -class BasePipeline: - """Base pipeline implementation.""" - - _default_handlers = () - - def __init__(self): - self._handlers = [] - for handler_name in self._default_handlers: - self._handlers.append(config.handlers[handler_name]) - - def __iter__(self): - """See `IPipeline`.""" - yield from self._handlers - - -@public -class OwnerPipeline(BasePipeline): - """The built-in owner pipeline.""" - - name = 'default-owner-pipeline' - description = _('The built-in owner pipeline.') - - _default_handlers = ( - 'owner-recipients', - 'to-outgoing', - ) - - -@public -class PostingPipeline(BasePipeline): - """The built-in posting pipeline.""" - - name = 'default-posting-pipeline' - description = _('The built-in posting pipeline.') - - _default_handlers = ( - 'mime-delete', - 'tagger', - 'member-recipients', - 'avoid-duplicates', - 'cleanse', - 'cleanse-dkim', - 'cook-headers', - 'subject-prefix', - 'rfc-2369', - 'to-archive', - 'to-digest', - 'to-usenet', - 'after-delivery', - 'acknowledge', - 'decorate', - 'dmarc', - 'to-outgoing', - ) - - -@public -class VirginPipeline(BasePipeline): - """The processing pipeline for virgin messages. - - Virgin messages are those that are crafted internally by Mailman. - """ - name = 'virgin' - description = _('The virgin queue pipeline.') - - _default_handlers = ( - 'cook-headers', - 'to-outgoing', - ) - - @public def initialize(): """Initialize the pipelines.""" # Find all handlers in the registered plugins. add_components('mailman.handlers', IHandler, config.handlers) # Set up some pipelines. - for pipeline_class in (OwnerPipeline, PostingPipeline, VirginPipeline): - pipeline = pipeline_class() - config.pipelines[pipeline.name] = pipeline + add_components('mailman.pipelines', IPipeline, config.pipelines) -- cgit v1.2.3-70-g09d2