More logging updates:

- Remove the LogStdErr() calls from all the scripts/* scripts.
- Convert the LockFile.py code to use the logging logs.  Also do general code
  cleanup in this module.  Note that the 'withlogging' argument to __init__()
  has been removed, as we can use logging's mechanisms to control how much of
  LockFile will get logged (by default, not much).
- Add the 'mailman.locks' logger to loginit.py
- Remove Mailman/Handlers/Sendmail.py once and for all
- Remove LIST_LOCK_DEBUGGING from Defaults.py.in

7 files changed, 70 insertions, 83 deletions

diff --git a/scripts/bounces b/scripts/bounces
index 67de045ae..7a8d6223c 100644
--- a/scripts/bounces
+++ b/scripts/bounces
@@ -1,20 +1,21 @@
 # -*- python -*-
 #
-# Copyright (C) 2001 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2006 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Process VERP'd bounces.
 
@@ -27,13 +28,10 @@ Errors are redirected to logs/errors.
 import sys
 
 import paths
-from Mailman import mm_cfg
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman import mm_cfg
 from Mailman.Queue.sbcache import get_switchboard
-from Mailman.Logging.Utils import LogStdErr
-
-LogStdErr('error', 'bounces')
+from Mailman.i18n import _
 
 
 
@@ -53,7 +51,7 @@ def main():
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     bounceq = get_switchboard(mm_cfg.BOUNCEQUEUE_DIR)
-    bounceq.enqueue(sys.stdin.read(), listname=listname, _plaintext=1)
+    bounceq.enqueue(sys.stdin.read(), listname=listname, _plaintext=True)
 
 
 
diff --git a/scripts/confirm b/scripts/confirm
index f95634f48..4443a41c5 100755
--- a/scripts/confirm
+++ b/scripts/confirm
@@ -1,20 +1,21 @@
 # -*- python -*-
 #
-# Copyright (C) 2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2006 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Simple confirm via VERP-ish sender.
 
@@ -31,9 +32,6 @@ from Mailman import mm_cfg
 from Mailman import Utils
 from Mailman.i18n import _
 from Mailman.Queue.sbcache import get_switchboard
-from Mailman.Logging.Utils import LogStdErr
-
-LogStdErr('error', 'confirm')
 
 
 
@@ -53,8 +51,8 @@ def main():
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     cmdq = get_switchboard(mm_cfg.CMDQUEUE_DIR)
-    cmdq.enqueue(sys.stdin.read(), listname=listname, toconfirm=1,
-                 _plaintext=1)
+    cmdq.enqueue(sys.stdin.read(), listname=listname,
+                 toconfirm=True, _plaintext=True)
 
 
 
diff --git a/scripts/join b/scripts/join
index 4e76010cb..3faab10ee 100755
--- a/scripts/join
+++ b/scripts/join
@@ -1,20 +1,21 @@
 # -*- python -*-
 #
-# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2006 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Simple join-a-list email address.
 
@@ -27,13 +28,10 @@ Errors are redirected to logs/errors.
 import sys
 
 import paths
-from Mailman import mm_cfg
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman import mm_cfg
 from Mailman.Queue.sbcache import get_switchboard
-from Mailman.Logging.Utils import LogStdErr
-
-LogStdErr('error', 'join')
+from Mailman.i18n import _
 
 
 
@@ -53,7 +51,8 @@ def main():
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     cmdq = get_switchboard(mm_cfg.CMDQUEUE_DIR)
-    cmdq.enqueue(sys.stdin.read(), listname=listname, tojoin=1, _plaintext=1)
+    cmdq.enqueue(sys.stdin.read(), listname=listname,
+                 tojoin=True, _plaintext=True)
 
 
 
diff --git a/scripts/leave b/scripts/leave
index a95c26a63..c80972d60 100755
--- a/scripts/leave
+++ b/scripts/leave
@@ -1,20 +1,21 @@
 # -*- python -*-
 #
-# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2006 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Simple leave-a-list email address.
 
@@ -27,13 +28,10 @@ Errors are redirected to logs/errors.
 import sys
 
 import paths
-from Mailman import mm_cfg
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman import mm_cfg
 from Mailman.Queue.sbcache import get_switchboard
-from Mailman.Logging.Utils import LogStdErr
-
-LogStdErr('error', 'leave')
+from Mailman.i18n import _
 
 
 
@@ -53,7 +51,8 @@ def main():
     # is a good example; if the limit is hit, the proc is SIGKILL'd giving us
     # no chance to save the message.
     cmdq = get_switchboard(mm_cfg.CMDQUEUE_DIR)
-    cmdq.enqueue(sys.stdin.read(), listname=listname, toleave=1, _plaintext=1)
+    cmdq.enqueue(sys.stdin.read(), listname=listname,
+                 toleave=True, _plaintext=True)
 
 
 
diff --git a/scripts/owner b/scripts/owner
index e03030eea..1cd480124 100755
--- a/scripts/owner
+++ b/scripts/owner
@@ -1,20 +1,21 @@
 # -*- python -*-
 #
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2006 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Send a message to the mailing list owner.
 
@@ -28,13 +29,10 @@ Stdin is the mail message, and argv[1] is the name of the target mailing list.
 import sys
 
 import paths
-from Mailman import mm_cfg
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman import mm_cfg
 from Mailman.Queue.sbcache import get_switchboard
-from Mailman.Logging.Utils import LogStdErr
-
-LogStdErr('error', 'mailowner')
+from Mailman.i18n import _
 
 
 
@@ -56,10 +54,10 @@ def main():
     inq = get_switchboard(mm_cfg.INQUEUE_DIR)
     inq.enqueue(sys.stdin.read(),
                 listname=listname,
-                _plaintext=1,
+                _plaintext=True,
                 envsender=Utils.get_site_email(extra='bounces'),
                 pipeline=mm_cfg.OWNER_PIPELINE,
-                toowner=1)
+                toowner=True)
 
 
 
diff --git a/scripts/post b/scripts/post
index 12ff0381b..1142f3abf 100755
--- a/scripts/post
+++ b/scripts/post
@@ -1,20 +1,21 @@
 # -*- python -*-
 #
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2006 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Accept posts to a list and handle them properly.
 
@@ -23,27 +24,23 @@ through the mail wrapper.  E.g. for list `test@yourdomain.com', the `test'
 alias would deliver to this script.
 
 Stdin is the mail message, and argv[1] is the name of the target mailing list.
-
 """
 
 import sys
 
 import paths
-from Mailman import mm_cfg
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman import mm_cfg
 from Mailman.Queue.sbcache import get_switchboard
-from Mailman.Logging.Utils import LogStdErr
-
-LogStdErr("error", "post")
+from Mailman.i18n import _
 
 
 
 def main():
-    # TBD: If you've configured your list or aliases so poorly as to get
-    # either of these first two errors, there's little that can be done to
-    # save your messages.  They will be lost.  Minimal testing of new lists
-    # should avoid either of these problems.
+    # XXX If you've configured your list or aliases so poorly as to get either
+    # of these first two errors, there's little that can be done to save your
+    # messages.  They will be lost.  Minimal testing of new lists should avoid
+    # either of these problems.
     try:
         listname = sys.argv[1]
     except IndexError:
@@ -61,7 +58,7 @@ def main():
     inq = get_switchboard(mm_cfg.INQUEUE_DIR)
     inq.enqueue(sys.stdin.read(),
                 listname=listname,
-                tolist=1, _plaintext=1)
+                tolist=True, _plaintext=True)
 
 
 
diff --git a/scripts/request b/scripts/request
index 12600a2b2..c3be1821d 100755
--- a/scripts/request
+++ b/scripts/request
@@ -1,20 +1,21 @@
 # -*- python -*-
 #
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2006 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Process emailed commands.
 
@@ -27,13 +28,10 @@ Errors are redirected to logs/errors.
 import sys
 
 import paths
-from Mailman import mm_cfg
 from Mailman import Utils
-from Mailman.i18n import _
+from Mailman import mm_cfg
 from Mailman.Queue.sbcache import get_switchboard
-from Mailman.Logging.Utils import LogStdErr
-
-LogStdErr('error', 'mailcmd')
+from Mailman.i18n import _
 
 
 
@@ -55,8 +53,8 @@ def main():
     cmdq = get_switchboard(mm_cfg.CMDQUEUE_DIR)
     cmdq.enqueue(sys.stdin.read(),
                  listname=listname,
-                 torequest=1,
-                 _plaintext=1)
+                 torequest=True,
+                 _plaintext=True)