------------------------------------------------------------
revno: 6590
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 3.0
timestamp: Fri 2008-02-08 08:12:04 -0500
message:
Rename 'prep queue' to 'pipeline queue'.
Add a pipeline queue runner.
added:
Mailman/queue/pipeline.py
modified:
Mailman/chains/accept.py
Mailman/configuration.py
Mailman/docs/chains.txt
Mailman/queue/docs/incoming.txt
Mailman/queue/incoming.py
=== modified file 'Mailman/chains/accept.py'
--- a/Mailman/chains/accept.py 2008-01-31 04:58:52 +0000
+++ b/Mailman/chains/accept.py 2008-02-08 13:12:04 +0000
@@ -50,6 +50,6 @@
rule_misses = msgdata.get('rule_misses')
if rule_misses:
msg['X-Mailman-Rule-Misses'] = SEMISPACE.join(rule_misses)
- accept_queue = Switchboard(config.PREPQUEUE_DIR)
+ accept_queue = Switchboard(config.PIPELINEQUEUE_DIR)
accept_queue.enqueue(msg, msgdata)
log.info('ACCEPT: %s', msg.get('message-id', 'n/a'))
=== modified file 'Mailman/configuration.py'
--- a/Mailman/configuration.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/configuration.py 2008-02-08 13:12:04 +0000
@@ -36,6 +36,7 @@
'.incoming.IncomingRunner',
'.news.NewsRunner',
'.outgoing.OutgoingRunner',
+ '.pipeline.PipelineRunner',
'.retry.RetryRunner',
'.virgin.VirginRunner',
)
@@ -136,7 +137,7 @@
self.MAILDIR_DIR = join(qdir, 'maildir')
self.NEWSQUEUE_DIR = join(qdir, 'news')
self.OUTQUEUE_DIR = join(qdir, 'out')
- self.PREPQUEUE_DIR = join(qdir, 'prepare')
+ self.PIPELINEQUEUE_DIR = join(qdir, 'pipeline')
self.RETRYQUEUE_DIR = join(qdir, 'retry')
self.SHUNTQUEUE_DIR = join(qdir, 'shunt')
self.VIRGINQUEUE_DIR = join(qdir, 'virgin')
=== modified file 'Mailman/docs/chains.txt'
--- a/Mailman/docs/chains.txt 2008-02-02 03:21:05 +0000
+++ b/Mailman/docs/chains.txt 2008-02-08 13:12:04 +0000
@@ -269,10 +269,10 @@
>>> print 'LOG:', fp.read()
LOG: ... ACCEPT: <first>
- >>> prepq = Switchboard(config.PREPQUEUE_DIR)
- >>> len(prepq.files)
+ >>> pipelineq = Switchboard(config.PIPELINEQUEUE_DIR)
+ >>> len(pipelineq.files)
1
- >>> qmsg, qdata = prepq.dequeue(prepq.files[0])
+ >>> qmsg, qdata = pipelineq.dequeue(pipelineq.files[0])
>>> print qmsg.as_string()
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
@@ -306,7 +306,7 @@
u'The built-in moderation chain.'
The previously created message is innocuous enough that it should pass through
-all default rules. This message will end up in the prep queue.
+all default rules. This message will end up in the pipeline queue.
>>> file_pos = fp.tell()
>>> from Mailman.app.chains import process
@@ -315,7 +315,7 @@
>>> print 'LOG:', fp.read()
LOG: ... ACCEPT: <first>
- >>> qmsg, qdata = prepq.dequeue(prepq.files[0])
+ >>> qmsg, qdata = pipelineq.dequeue(pipelineq.files[0])
>>> print qmsg.as_string()
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
=== modified file 'Mailman/queue/docs/incoming.txt'
--- a/Mailman/queue/docs/incoming.txt 2008-02-02 18:47:23 +0000
+++ b/Mailman/queue/docs/incoming.txt 2008-02-08 13:12:04 +0000
@@ -22,7 +22,7 @@
We have a message that is going to be sent to the mailing list. This message
is so perfectly fine for posting that it will be accepted and forward to the
-prep queue.
+pipeline queue.
>>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
@@ -46,18 +46,18 @@
>>> incoming = make_testable_runner(IncomingRunner)
>>> incoming.run()
-And now the message is in the prep queue.
+And now the message is in the pipeline queue.
>>> from Mailman.configuration import config
>>> from Mailman.queue import Switchboard
- >>> prep_queue = Switchboard(config.PREPQUEUE_DIR)
- >>> len(prep_queue.files)
+ >>> pipeline_queue = Switchboard(config.PIPELINEQUEUE_DIR)
+ >>> len(pipeline_queue.files)
1
>>> incoming_queue = Switchboard(config.INQUEUE_DIR)
>>> len(incoming_queue.files)
0
>>> from Mailman.tests.helpers import get_queue_messages
- >>> item = get_queue_messages(prep_queue)[0]
+ >>> item = get_queue_messages(pipeline_queue)[0]
>>> print item.msg.as_string()
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
@@ -78,8 +78,8 @@
-------------
The list moderator sets the emergency flag on the mailing list. The built-in
-chain will now hold all posted messages, so nothing will show up in the prep
-queue.
+chain will now hold all posted messages, so nothing will show up in the
+pipeline queue.
# XXX This checks the vette log file because there is no other evidence
# that this chain has done anything.
@@ -92,7 +92,7 @@
>>> inject(u'[EMAIL PROTECTED]', msg)
>>> file_pos = fp.tell()
>>> incoming.run()
- >>> len(prep_queue.files)
+ >>> len(pipeline_queue.files)
0
>>> len(incoming_queue.files)
0
@@ -124,7 +124,7 @@
>>> inject(u'[EMAIL PROTECTED]', msg)
>>> file_pos = fp.tell()
>>> incoming.run()
- >>> len(prep_queue.files)
+ >>> len(pipeline_queue.files)
0
>>> len(incoming_queue.files)
0
@@ -158,7 +158,7 @@
>>> inject(u'[EMAIL PROTECTED]', msg)
>>> file_pos = fp.tell()
>>> incoming.run()
- >>> len(prep_queue.files)
+ >>> len(pipeline_queue.files)
0
>>> len(incoming_queue.files)
0
=== modified file 'Mailman/queue/incoming.py'
--- a/Mailman/queue/incoming.py 2008-02-02 16:18:22 +0000
+++ b/Mailman/queue/incoming.py 2008-02-08 13:12:04 +0000
@@ -26,8 +26,6 @@
immediately.
"""
-
-
from Mailman.app.chains import process
from Mailman.configuration import config
from Mailman.queue import Runner
=== added file 'Mailman/queue/pipeline.py'
--- a/Mailman/queue/pipeline.py 1970-01-01 00:00:00 +0000
+++ b/Mailman/queue/pipeline.py 2008-02-08 13:12:04 +0000
@@ -0,0 +1,39 @@
+# Copyright (C) 2008 by the Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+"""The pipeline queue runner.
+
+This runner's purpose is to take messages that have been approved for posting
+through the 'preparation pipeline'. This pipeline adds, deletes and modifies
+headers, calculates message recipients, and more.
+"""
+
+from Mailman.app.pipeline import process
+from Mailman.configuration import config
+from Mailman.queue import runner
+
+
+
+class PipelineRunner(Runner):
+ QDIR = config.PIPELINEQUEUE_DIR
+
+ def _dispose(self, mlist, msg, msgdata):
+ # Process the message through the mailing list's pipeline.
+ process(mlist, msg, msgdata, mlist.pipeline)
+ # Do not keep this message queued.
+ return False
+
--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
