summaryrefslogtreecommitdiff
path: root/mailman/bin/master.py
diff options
context:
space:
mode:
authorBarry Warsaw2008-03-22 21:43:38 -0400
committerBarry Warsaw2008-03-22 21:43:38 -0400
commit78aeaf14e41c473655267d8a0fad175c783012e7 (patch)
tree6a65a11c73c163299860d07409212e8215fe9165 /mailman/bin/master.py
parent6d9084326a4470da44c15193ddf0c4573fccb7f9 (diff)
downloadmailman-78aeaf14e41c473655267d8a0fad175c783012e7.tar.gz
mailman-78aeaf14e41c473655267d8a0fad175c783012e7.tar.zst
mailman-78aeaf14e41c473655267d8a0fad175c783012e7.zip
Diffstat (limited to 'mailman/bin/master.py')
-rw-r--r--mailman/bin/master.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/mailman/bin/master.py b/mailman/bin/master.py
index 6577a0079..7369dd2ca 100644
--- a/mailman/bin/master.py
+++ b/mailman/bin/master.py
@@ -38,11 +38,9 @@ from locknix import lockfile
from munepy import Enum
from mailman import Defaults
-from mailman import Version
from mailman import loginit
from mailman.configuration import config
from mailman.i18n import _
-from mailman.initialize import initialize
from mailman.options import Options
@@ -51,7 +49,7 @@ LOCK_LIFETIME = Defaults.days(1) + Defaults.hours(6)
-class MasterOptions(Options):
+class ScriptOptions(Options):
"""Options for the master watcher."""
usage = _("""\
@@ -405,8 +403,9 @@ qrunner %s reached maximum restart limit of %d, not restarting.""",
def main():
"""Main process."""
- options = MasterOptions()
- initialize(options.options.config)
+
+ options = ScriptOptions()
+ options.initialize()
# Acquire the master lock, exiting if we can't acquire it. We'll let the
# caller handle any clean up or lock breaking. No with statement here