From 2945efc08c62dbe4ed58cb35ee100b719fe6a795 Mon Sep 17 00:00:00 2001 From: bwarsaw Date: Tue, 12 Mar 2002 00:47:01 +0000 Subject: __init__(): Remove cachelists from the constructor arguments. We can more conveniently use a class attribute to specify this. On the BounceRunner, turn off MailList object caching so that it'll be more friendly to long-term memory use. --- Mailman/Queue/BounceRunner.py | 1 + Mailman/Queue/OutgoingRunner.py | 4 ++-- Mailman/Queue/Runner.py | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'Mailman/Queue') diff --git a/Mailman/Queue/BounceRunner.py b/Mailman/Queue/BounceRunner.py index 5013b8e77..295ea440c 100644 --- a/Mailman/Queue/BounceRunner.py +++ b/Mailman/Queue/BounceRunner.py @@ -31,6 +31,7 @@ from Mailman.Logging.Syslog import syslog class BounceRunner(Runner): QDIR = mm_cfg.BOUNCEQUEUE_DIR + CACHELISTS = 0 def _dispose(self, mlist, msg, msgdata): outq = get_switchboard(mm_cfg.OUTQUEUE_DIR) diff --git a/Mailman/Queue/OutgoingRunner.py b/Mailman/Queue/OutgoingRunner.py index 05b1a4b32..0b3973999 100644 --- a/Mailman/Queue/OutgoingRunner.py +++ b/Mailman/Queue/OutgoingRunner.py @@ -38,8 +38,8 @@ 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, slice, numslices, cachelists) + def __init__(self, slice=None, numslices=1): + Runner.__init__(self, slice, numslices) # 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 ffa6b2a8c..ffc8900d1 100644 --- a/Mailman/Queue/Runner.py +++ b/Mailman/Queue/Runner.py @@ -34,9 +34,11 @@ from Mailman.Logging.Syslog import syslog class Runner: - def __init__(self, slice=None, numslices=1, cachelists=1): + CACHELISTS = 1 + + def __init__(self, slice=None, numslices=1): self._kids = {} - self._cachelists = cachelists + self._cachelists = self.CACHELISTS # Create our own switchboard. Don't use the switchboard cache because # we want to provide slice and numslice arguments. self._switchboard = Switchboard(self.QDIR, slice, numslices) -- cgit v1.3.1