------------------------------------------------------------
revno: 1368
fixes bug: https://launchpad.net/bugs/1082308
committer: Mark Sapiro <msap...@value.net>
branch nick: 2.1
timestamp: Sat 2012-11-24 11:05:25 -0800
message:
The name of the mailmanctl master lock file is now congigurable via the
mm_cfg.py setting MASTER_LOCK_FILE. (LP: 1082308)
modified:
Mailman/Defaults.py.in
NEWS
bin/mailmanctl
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in 2012-06-20 23:32:30 +0000
+++ Mailman/Defaults.py.in 2012-11-24 19:05:25 +0000
@@ -844,6 +844,12 @@
# affects both message pickles and MailList config.pck files.
SYNC_AFTER_WRITE = No
+# This is the name used for the mailmanctl master lock file. In a clustered
+# load sharing environment with a shared 'locks' directory, it is desirable
+# to have separate locks for each host mailmanctl. This can be used to enable
+# that.
+MASTER_LOCK_FILE = 'master-qrunner'
+
#####
=== modified file 'NEWS'
--- NEWS 2012-11-02 03:19:11 +0000
+++ NEWS 2012-11-24 19:05:25 +0000
@@ -15,6 +15,9 @@
- IncomingRunner now logs rejected messages to the vette log.
(LP: 1068837)
+ - The name of the mailmanctl master lock file is now congigurable via the
+ mm_cfg.py setting MASTER_LOCK_FILE. (LP: 1082308)
+
i18n
- German message catalog has been updated per Ralf Hildebrandt.
=== modified file 'bin/mailmanctl'
--- bin/mailmanctl 2010-02-15 18:59:20 +0000
+++ bin/mailmanctl 2012-11-24 19:05:25 +0000
@@ -117,7 +117,7 @@
DOT = '.'
# Locking contantsa
-LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'master-qrunner')
+LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, mm_cfg.MASTER_LOCK_FILE)
# Since we wake up once per day and refresh the lock, the LOCK_LIFETIME
# needn't be (much) longer than SNOOZE. We pad it 6 hours just to be safe.
LOCK_LIFETIME = mm_cfg.days(1) + mm_cfg.hours(6)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
