summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBarry Warsaw2012-12-23 15:10:51 -0500
committerBarry Warsaw2012-12-23 15:10:51 -0500
commite75e3c364a26ee08b0da9b29115de40271f574c5 (patch)
tree0d1709b633366a5cb552739c723230aad9ab1ef7 /src
parent5d31d7cb6e875f343f409147cbd626682c7ee21a (diff)
downloadmailman-e75e3c364a26ee08b0da9b29115de40271f574c5.tar.gz
mailman-e75e3c364a26ee08b0da9b29115de40271f574c5.tar.zst
mailman-e75e3c364a26ee08b0da9b29115de40271f574c5.zip
Diffstat (limited to 'src')
-rw-r--r--src/mailman/bin/master.py2
-rw-r--r--src/mailman/commands/cli_control.py8
-rw-r--r--src/mailman/docs/NEWS.rst2
3 files changed, 8 insertions, 4 deletions
diff --git a/src/mailman/bin/master.py b/src/mailman/bin/master.py
index 25a7dc444..00469c46a 100644
--- a/src/mailman/bin/master.py
+++ b/src/mailman/bin/master.py
@@ -425,6 +425,7 @@ class Loop:
necessary and configured to do so.
"""
log = logging.getLogger('mailman.runner')
+ log.info('Master started')
self._pause()
while True:
try:
@@ -478,6 +479,7 @@ Runner {0} reached maximum restart limit of {1:d}, not restarting.""",
new_pid = self._start_runner(spec)
new_info = (rname, slice_number, count, restarts)
self._kids.add(new_pid, new_info)
+ log.info('Master stopped')
def cleanup(self):
"""Ensure that all children have exited."""
diff --git a/src/mailman/commands/cli_control.py b/src/mailman/commands/cli_control.py
index b5a79b820..6e211b83c 100644
--- a/src/mailman/commands/cli_control.py
+++ b/src/mailman/commands/cli_control.py
@@ -48,7 +48,7 @@ qlog = logging.getLogger('mailman.runner')
@implementer(ICLISubCommand)
class Start:
- """Start the Mailman daemons."""
+ """Start the Mailman master and runner processes."""
name = 'start'
@@ -191,7 +191,7 @@ class SignalCommand:
class Stop(SignalCommand):
- """Stop the Mailman daemons."""
+ """Stop the Mailman master and runner processes."""
name = 'stop'
message = _("Shutting down Mailman's master runner")
@@ -199,7 +199,7 @@ class Stop(SignalCommand):
class Reopen(SignalCommand):
- """Reopen the Mailman daemons."""
+ """Signal the Mailman processes to re-open their log files.."""
name = 'reopen'
message = _('Reopening the Mailman runners')
@@ -208,7 +208,7 @@ class Reopen(SignalCommand):
@implementer(ICLISubCommand)
class Restart(SignalCommand):
- """Stop the Mailman daemons."""
+ """Stop and restart the Mailman runner subprocesses."""
name = 'restart'
message = _('Restarting the Mailman runners')
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index b9720b960..c0a94ab0d 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -88,6 +88,8 @@ Other
* Two new events are triggered on membership changes: `SubscriptionEvent`
when a new member joins a mailing list, and an `UnsubscriptionEvent` when a
member leaves a mailing list. (LP: #1047286)
+ * Improve the --help text for the `start`, `stop`, `restart`, and `reopen`
+ subcommands. (LP: #1035033)
Bugs
----