diff options
| author | Mark Sapiro <msapiro@value.net> | 2012-11-24 11:05:25 -0800 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2012-11-24 11:05:25 -0800 |
| commit | 5e9ccd5d1dde2160cfdffac64eed0e78d7de5a48 (patch) | |
| tree | 4b51a54363c272be163b9fd0d31a3d754a6a6d31 | |
| parent | d9efa7366817f87af212995a28cccaf457cdff40 (diff) | |
| download | mailman2-5e9ccd5d1dde2160cfdffac64eed0e78d7de5a48.tar.gz mailman2-5e9ccd5d1dde2160cfdffac64eed0e78d7de5a48.tar.xz mailman2-5e9ccd5d1dde2160cfdffac64eed0e78d7de5a48.zip | |
The name of the mailmanctl master lock file is now congigurable via the
mm_cfg.py setting MASTER_LOCK_FILE. (LP: 1082308)
| -rwxr-xr-x | Mailman/Defaults.py.in | 6 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | bin/mailmanctl | 2 |
3 files changed, 10 insertions, 1 deletions
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' + ##### @@ -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) |