diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2012-11-20 09:47:47 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2012-11-20 09:47:47 +0000 |
| commit | 65898a3024a49104a9e8123deec105b11de001e3 (patch) | |
| tree | 657d34d40deed3c1977a7b942dc5e32505512802 /usr.sbin/smtpd/smtpd.c | |
| parent | f6aefaa94996adb3a94cf829d7d536f2457f186f (diff) | |
Allow "smtpctl show queue" to run in "online" mode if the smtpd server
is running. The scheduler sends the runtime state of each envelope to
the queue process which loads the envelope, fills the runtime bits and
sends the envelope back to the client. Iteration over the envelope set
happens in small chunks to make the request interruptible and to allow
the server to keep doing its job in the meantime.
Adpat "smtpctl schedule-all" to schedule the messages one by one using
the same iteration mechanism.
Document "smtpctl monitor" and "smtpctl show queue".
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.c')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index ffb57be4e46..4b73879089d 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.181 2012/11/12 14:58:53 eric Exp $ */ +/* $OpenBSD: smtpd.c,v 1.182 2012/11/20 09:47:46 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -1339,6 +1339,8 @@ imsg_to_str(int type) CASE(IMSG_QUEUE_REMOVE); CASE(IMSG_QUEUE_EXPIRE); + CASE(IMSG_SCHEDULER_MESSAGES); + CASE(IMSG_SCHEDULER_ENVELOPES); CASE(IMSG_SCHEDULER_REMOVE); CASE(IMSG_SCHEDULER_SCHEDULE); |