diff options
| -rw-r--r-- | Mailman/Queue/ArchRunner.py | 4 | ||||
| -rw-r--r-- | Mailman/Queue/BounceRunner.py | 4 | ||||
| -rw-r--r-- | Mailman/Queue/CommandRunner.py | 4 | ||||
| -rw-r--r-- | Mailman/Queue/IncomingRunner.py | 4 | ||||
| -rw-r--r-- | Mailman/Queue/NewsRunner.py | 4 | ||||
| -rw-r--r-- | Mailman/Queue/OutgoingRunner.py | 5 | ||||
| -rw-r--r-- | Mailman/Queue/Runner.py | 5 | ||||
| -rw-r--r-- | Mailman/Queue/VirginRunner.py | 6 |
8 files changed, 11 insertions, 25 deletions
diff --git a/Mailman/Queue/ArchRunner.py b/Mailman/Queue/ArchRunner.py index 95dc42724..46e433d02 100644 --- a/Mailman/Queue/ArchRunner.py +++ b/Mailman/Queue/ArchRunner.py @@ -26,9 +26,7 @@ from Mailman.Queue.Runner import Runner class ArchRunner(Runner): - def __init__(self, slice=None, numslices=1, cachelists=1): - Runner.__init__(self, mm_cfg.ARCHQUEUE_DIR, - slice, numslices, cachelists) + QDIR = mm_cfg.ARCHQUEUE_DIR def _dispose(self, mlist, msg, msgdata): # Now try to get the list lock diff --git a/Mailman/Queue/BounceRunner.py b/Mailman/Queue/BounceRunner.py index 2daca4cf5..9e81bfa32 100644 --- a/Mailman/Queue/BounceRunner.py +++ b/Mailman/Queue/BounceRunner.py @@ -30,9 +30,7 @@ from Mailman.Logging.Syslog import syslog class BounceRunner(Runner): - def __init__(self, slice=None, numslices=1, cachelists=1): - Runner.__init__(self, mm_cfg.BOUNCEQUEUE_DIR, - slice, numslices, cachelists) + QDIR = mm_cfg.BOUNCEQUEUE_DIR def _dispose(self, mlist, msg, msgdata): outq = get_switchboard(mm_cfg.OUTQUEUE_DIR) diff --git a/Mailman/Queue/CommandRunner.py b/Mailman/Queue/CommandRunner.py index 16a0e1e28..a2d8cee60 100644 --- a/Mailman/Queue/CommandRunner.py +++ b/Mailman/Queue/CommandRunner.py @@ -35,9 +35,7 @@ from Mailman import LockFile class CommandRunner(Runner): - def __init__(self, slice=None, numslices=1, cachelists=1): - Runner.__init__(self, mm_cfg.CMDQUEUE_DIR, - slice, numslices, cachelists) + QDIR = mm_cfg.CMDQUEUE_DIR def _dispose(self, mlist, msg, msgdata): # BAW: Not all the functions of this qrunner require the list to be diff --git a/Mailman/Queue/IncomingRunner.py b/Mailman/Queue/IncomingRunner.py index 0abf058c0..f36832431 100644 --- a/Mailman/Queue/IncomingRunner.py +++ b/Mailman/Queue/IncomingRunner.py @@ -89,9 +89,7 @@ from Mailman.Logging.Syslog import syslog class IncomingRunner(Runner): - def __init__(self, slice=None, numslices=1, cachelists=1): - Runner.__init__(self, mm_cfg.INQUEUE_DIR, - slice, numslices, cachelists) + QDIR = mm_cfg.INQUEUE_DIR def _dispose(self, mlist, msg, msgdata): # Try to get the list lock. diff --git a/Mailman/Queue/NewsRunner.py b/Mailman/Queue/NewsRunner.py index db4249383..383c59ed3 100644 --- a/Mailman/Queue/NewsRunner.py +++ b/Mailman/Queue/NewsRunner.py @@ -47,9 +47,7 @@ mcre = re.compile(r""" class NewsRunner(Runner): - def __init__(self, slice=None, numslices=1, cachelists=1): - Runner.__init__(self, mm_cfg.NEWSQUEUE_DIR, - slice, numslices, cachelists) + QDIR = mm_cfg.NEWSQUEUE_DIR def _dispose(self, mlist, msg, msgdata): if not msgdata.get('prepped'): diff --git a/Mailman/Queue/OutgoingRunner.py b/Mailman/Queue/OutgoingRunner.py index 10dda86af..4bc1afa8b 100644 --- a/Mailman/Queue/OutgoingRunner.py +++ b/Mailman/Queue/OutgoingRunner.py @@ -36,9 +36,10 @@ DEAL_WITH_PERMFAILURES_EVERY = 1 class OutgoingRunner(Runner): + QDIR = mm_cfg.OUTQUEUE_DIR + def __init__(self, slice=None, numslices=1, cachelists=1): - Runner.__init__(self, mm_cfg.OUTQUEUE_DIR, - slice, numslices, cachelists) + Runner.__init__(self, slice, numslices, cachelists) # Maps mailing lists to (recip, msg) tuples self._permfailures = {} self._permfail_counter = 0 diff --git a/Mailman/Queue/Runner.py b/Mailman/Queue/Runner.py index f58e23be3..53ab0e006 100644 --- a/Mailman/Queue/Runner.py +++ b/Mailman/Queue/Runner.py @@ -34,13 +34,12 @@ from Mailman.Logging.Syslog import syslog class Runner: - def __init__(self, qdir, slice=None, numslices=1, cachelists=1): - self._qdir = qdir + def __init__(self, slice=None, numslices=1, cachelists=1): self._kids = {} self._cachelists = cachelists # Create our own switchboard. Don't use the switchboard cache because # we want to provide slice and numslice arguments. - self._switchboard = Switchboard(qdir, slice, numslices) + self._switchboard = Switchboard(self.QDIR, slice, numslices) # Create the shunt switchboard self._shunt = Switchboard(mm_cfg.SHUNTQUEUE_DIR) self._stop = 0 diff --git a/Mailman/Queue/VirginRunner.py b/Mailman/Queue/VirginRunner.py index 94486827f..0be165713 100644 --- a/Mailman/Queue/VirginRunner.py +++ b/Mailman/Queue/VirginRunner.py @@ -29,11 +29,7 @@ from Mailman.Queue.IncomingRunner import IncomingRunner class VirginRunner(IncomingRunner): - def __init__(self, slice=None, numslices=1, cachelists=1): - # Don't call IncomingRunner's __init__() because we want to supply a - # different queue directory. - Runner.__init__(self, mm_cfg.VIRGINQUEUE_DIR, - slice, numslices, cachelists) + QDIR = mm_cfg.VIRGINQUEUE_DIR def _dispose(self, mlist, msg, msgdata): # We need to fasttrack this message through any handlers that touch |