9 files changed, 21 insertions, 21 deletions

diff --git a/mailman/bin/docs/master.txt b/mailman/bin/docs/master.txt
index 2938c7ffb..0d3cade77 100644
--- a/mailman/bin/docs/master.txt
+++ b/mailman/bin/docs/master.txt
@@ -12,7 +12,13 @@ Start the master in a subthread.
 
     >>> master = TestableMaster()
     >>> master.start()
-    >>> len(list(master.qrunner_pids)) == len(config.qrunners)
+
+There should be a process id for every qrunner that claims to be startable.
+
+    >>> from lazr.config import as_boolean
+    >>> startable_qrunners = [qconf for qconf in config.qrunner_configs
+    ...                       if as_boolean(qconf.start)]
+    >>> len(list(master.qrunner_pids)) == len(startable_qrunners)
     True
 
 Now verify that all the qrunners are running.
diff --git a/mailman/bin/master.py b/mailman/bin/master.py
index e47e0d839..1f9868b48 100644
--- a/mailman/bin/master.py
+++ b/mailman/bin/master.py
@@ -32,6 +32,7 @@ import socket
 import logging
 
 from datetime import timedelta
+from lazr.config import as_boolean
 from locknix import lockfile
 from munepy import Enum
 
@@ -316,7 +317,7 @@ class Loop:
             section_name = 'qrunner.' + name
             # Let AttributeError propagate.
             qrunner_config = getattr(config, section_name)
-            if not qrunner_config.start:
+            if not as_boolean(qrunner_config.start):
                 continue
             package, class_name = qrunner_config['class'].rsplit(DOT, 1)
             __import__(package)
diff --git a/mailman/config/mailman.cfg b/mailman/config/mailman.cfg
index 126017790..2143d2427 100644
--- a/mailman/config/mailman.cfg
+++ b/mailman/config/mailman.cfg
@@ -31,7 +31,7 @@ start: no
 [qrunner.bounces]
 class: mailman.queue.bounce.BounceRunner
 
-[qrunner.commands]
+[qrunner.command]
 class: mailman.queue.command.CommandRunner
 
 [qrunner.in]
@@ -56,6 +56,7 @@ class: mailman.queue.pipeline.PipelineRunner
 
 [qrunner.retry]
 class: mailman.queue.retry.RetryRunner
+sleep_time: 15m
 
 [qrunner.shunt]
 class: mailman.queue.fake.ShuntRunner
diff --git a/mailman/docs/archivers.txt b/mailman/docs/archivers.txt
index 7ea9b1bd4..b8da86809 100644
--- a/mailman/docs/archivers.txt
+++ b/mailman/docs/archivers.txt
@@ -167,7 +167,7 @@ Messages sent to a local MHonArc instance are added to its archive via a
 subprocess call.
 
     >>> archiver.archive_message(mlist, msg)
-    >>> archive_log = open(os.path.join(config.LOG_DIR, 'mailman'))
+    >>> archive_log = open(os.path.join(config.LOG_DIR, 'archiver'))
     >>> try:
     ...     contents = archive_log.read()
     ... finally:
diff --git a/mailman/docs/chains.txt b/mailman/docs/chains.txt
index d89ec2be4..6c2137e27 100644
--- a/mailman/docs/chains.txt
+++ b/mailman/docs/chains.txt
@@ -70,8 +70,7 @@ this action.
 
 The bounce message is now sitting in the Virgin queue.
 
-    >>> from mailman.queue import Switchboard
-    >>> virginq = Switchboard(config.VIRGINQUEUE_DIR)
+    >>> virginq = config.switchboards['virgin']
     >>> len(virginq.files)
     1
     >>> qmsg, qdata = virginq.dequeue(virginq.files[0])
@@ -268,7 +267,7 @@ processed and sent on to the list membership.
     >>> print 'LOG:', fp.read()
     LOG: ... ACCEPT: <first>
 
-    >>> pipelineq = Switchboard(config.PIPELINEQUEUE_DIR)
+    >>> pipelineq = config.switchboards['pipeline']
     >>> len(pipelineq.files)
     1
     >>> qmsg, qdata = pipelineq.dequeue(pipelineq.files[0])
diff --git a/mailman/queue/pipeline.py b/mailman/queue/pipeline.py
index 4d4be7790..532e256d1 100644
--- a/mailman/queue/pipeline.py
+++ b/mailman/queue/pipeline.py
@@ -22,15 +22,13 @@ through the 'preparation pipeline'.  This pipeline adds, deletes and modifies
 headers, calculates message recipients, and more.
 """
 
-from mailman.app.pipelines import process
+from mailman.core.pipelines import process
 from mailman.config 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)
diff --git a/mailman/queue/retry.py b/mailman/queue/retry.py
index 03cf86848..d502e3bb9 100644
--- a/mailman/queue/retry.py
+++ b/mailman/queue/retry.py
@@ -18,23 +18,20 @@
 import time
 
 from mailman.config import config
-from mailman.queue import Runner, Switchboard
+from mailman.queue import Runner
 
 
 
 class RetryRunner(Runner):
-    QDIR = config.RETRYQUEUE_DIR
-    SLEEPTIME = config.minutes(15)
-
     def __init__(self, slice=None, numslices=1):
         Runner.__init__(self, slice, numslices)
-        self.__outq = Switchboard(config.OUTQUEUE_DIR)
+        self._outq = config.switchboards['out']
 
     def _dispose(self, mlist, msg, msgdata):
         # Move it to the out queue for another retry
-        self.__outq.enqueue(msg, msgdata)
+        self._outq.enqueue(msg, msgdata)
         return False
 
     def _snooze(self, filecnt):
         # We always want to snooze
-        time.sleep(float(self.SLEEPTIME))
+        time.sleep(self.sleep_float)
diff --git a/mailman/queue/virgin.py b/mailman/queue/virgin.py
index 917d702ca..6d913d1a0 100644
--- a/mailman/queue/virgin.py
+++ b/mailman/queue/virgin.py
@@ -23,15 +23,13 @@ to go through some minimal processing before they can be sent out to the
 recipient.
 """
 
-from mailman.app.pipelines import process
+from mailman.core.pipelines import process
 from mailman.config import config
 from mailman.queue import Runner
 
 
 
 class VirginRunner(Runner):
-    QDIR = config.VIRGINQUEUE_DIR
-
     def _dispose(self, mlist, msg, msgdata):
         # We need to fast track this message through any pipeline handlers
         # that touch it, e.g. especially cook-headers.
diff --git a/mailman/testing/testing.cfg b/mailman/testing/testing.cfg
index 9570441dd..636b4a2d5 100644
--- a/mailman/testing/testing.cfg
+++ b/mailman/testing/testing.cfg
@@ -64,7 +64,7 @@ recipient: archive@mail-archive.dev
 base_url: http://www.example.com/pipermail/$listname
 
 [archiver.mhonarc]
-command: /bin/echo
+command: /bin/echo "/usr/bin/mhonarc -add -dbfile $PRIVATE_ARCHIVE_FILE_DIR/${listname}.mbox/mhonarc.db -outdir $VAR_DIR/mhonarc/${listname} -stderr $LOG_DIR/mhonarc -stdout $LOG_DIR/mhonarc -spammode -umask 022"
 
 [domain.example_dot_com]
 email_host: example.com