From 5e9ccd5d1dde2160cfdffac64eed0e78d7de5a48 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sat, 24 Nov 2012 11:05:25 -0800 Subject: The name of the mailmanctl master lock file is now congigurable via the mm_cfg.py setting MASTER_LOCK_FILE. (LP: 1082308) --- Mailman/Defaults.py.in | 6 ++++++ NEWS | 3 +++ bin/mailmanctl | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index fb3f4f39..a794c65c 100755 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -844,6 +844,12 @@ BAD_SHUNT_ARCHIVE_DIRECTORY = None # 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' + ##### diff --git a/NEWS b/NEWS index fb5ce6be..f5b58ebc 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ Here is a history of user visible changes to Mailman. - 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. diff --git a/bin/mailmanctl b/bin/mailmanctl index 613f909f..caddb8b8 100644 --- a/bin/mailmanctl +++ b/bin/mailmanctl @@ -117,7 +117,7 @@ COMMASPACE = ', ' 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) -- cgit v1.2.3