diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 67 | ||||
| -rw-r--r-- | doc/doc-txt/NewStuff | 5 |
2 files changed, 69 insertions, 3 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index f165c368a..9a10d8d21 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -3825,6 +3825,14 @@ This option is not intended for use by external callers. It is used internally by Exim in conjunction with the &%-MC%& option. It signifies that the remote host supports the ESMTP &_DSN_& extension. +.new +.vitem &%-MCG%& +.oindex "&%-MCG%&" +This option is not intended for use by external callers. It is used internally +by Exim in conjunction with the &%-MC%& option. It signifies that an +alternate queue is used, named by the following option. +.wen + .vitem &%-MCP%& .oindex "&%-MCP%&" This option is not intended for use by external callers. It is used internally @@ -4371,7 +4379,10 @@ relax this restriction (and also the same requirement for the &%-M%&, &%-R%&, and &%-S%& options). .cindex "queue runner" "description of operation" -The &%-q%& option starts one queue runner process. This scans the queue of +.new +If other commandline options do not specify an action, +.wen +the &%-q%& option starts one queue runner process. This scans the queue of waiting messages, and runs a delivery process for each one in turn. It waits for each delivery process to finish before starting the next one. A delivery process may not actually do any deliveries if the retry times for the addresses @@ -4456,8 +4467,29 @@ The &'l'& (the letter &"ell"&) flag specifies that only local deliveries are to be done. If a message requires any remote deliveries, it remains on the queue for later delivery. -.vitem &%-q%&<&'qflags'&>&~<&'start&~id'&>&~<&'end&~id'&> +.new +.vitem &%-q[q][i][f[f]][l][G<name>[/<time>]]]%& +.oindex "&%-qG%&" +.cindex queue named +.cindex "named queues" .cindex "queue" "delivering specific messages" +If the &'G'& flag and a name is present, the queue runner operates on the +queue with the given name rather than the default queue. +The name should not contain a &'/'& character. +For a periodic queue run (see below) +append to the name a slash and a time value. + +If other commandline options speicify an action, a &'-qG<name>'& option +will specify a queue to operate on. +For example: +.code +exim -bp -qGquarantine +mailq -qGquarantime +exim -qGoffpeak -Rf @special.domain.example +.endd +.wen + +.vitem &%-q%&<&'qflags'&>&~<&'start&~id'&>&~<&'end&~id'&> When scanning the queue, Exim can be made to skip over messages whose ids are lexically less than a given value by following the &%-q%& option with a starting message id. For example: @@ -12210,6 +12242,14 @@ The value set for the &%qualify_domain%& option in the configuration file. The value set for the &%qualify_recipient%& option in the configuration file, or if not set, the value of &$qualify_domain$&. +.new +.vitem &$queue_name$& +.vindex &$queue_name$& +.cindex "named queues" +.cindex queues named +The name of the spool queue in use; empty for the default queue. +.wen + .vitem &$rcpt_count$& .vindex "&$rcpt_count$&" When a message is being received by SMTP, this variable contains the number of @@ -15920,7 +15960,7 @@ large list. In most situations, &%queue_run_in_order%& should not be set. -.option queue_run_max main integer 5 +.option queue_run_max main integer&!! 5 .cindex "queue runner" "maximum number of" This controls the maximum number of queue runner processes that an Exim daemon can run simultaneously. This does not mean that it starts them all at once, @@ -15935,6 +15975,13 @@ the limit, allowing any number of simultaneous queue runner processes to be run. If you do not want queue runs to occur, omit the &%-q%&&'xx'& setting on the daemon's command line. +.new +.cindex queues named +.condex "named queues" +To set limits for different named queues use +an expansion depending on the &$queue_name$& variable. +.wen + .option queue_smtp_domains main "domain list&!!" unset .cindex "queueing incoming messages" .cindex "message" "queueing remote deliveries" @@ -28590,6 +28637,19 @@ all the conditions are true, wherever it appears in an ACL command, whereas effect. +.new +.vitem &*queue*&&~=&~<&'text'&> +This modifier specifies the use of a named queue for spool files +for the message. +It can only be used before the message is received (i.e. not in +the DATA ACL). +This could be used, for example, for known high-volume burst sources +of traffic, or for quarantine of messages. +Separate queue-runner processes will be needed for named queues. +If the text after expansion is empty, the default queue is used. +.wen + + .vitem &*remove_header*&&~=&~<&'text'&> This modifier specifies one or more header names in a colon-separated list that are to be removed from an incoming message, assuming, of course, that @@ -35564,6 +35624,7 @@ the following table: &`P `& on &`<=`& lines: protocol used &` `& on &`=>`& and &`**`& lines: return path &`PRX `& on &'<='& and&`=>`& lines: proxy address +&`Q `& alternate queue name &`QT `& on &`=>`& lines: time spent on queue so far &` `& on &"Completed"& lines: time spent on queue &`R `& on &`<=`& lines: reference for local bounce diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 90aefc4fe..2a776b730 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -21,6 +21,11 @@ Version 4.88 N can be 224, 256 (default), 384, 512. With GnuTLS 3.5.0 or later, only. + 5. Facility for named queues: A commandline argument can specify + the queue name for a queue operation, and an ACL modifier can set + the queue to be used for a message. A $queue_name variable gives + visibility. + Version 4.87 ------------ |