New $queue_name variable

queue_run_max main option expanded, allowing per-queue values

5 files changed, 16 insertions, 2 deletions

diff --git a/test/confs/0001 b/test/confs/0001
index 0daf053bd..0fd7efe44 100644
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -148,7 +148,7 @@ no_queue_only_override
 queue_only_file = /var/spool/exim/queue_only
 queue_only_load = 8.2
 no_queue_run_in_order
-queue_run_max = 5
+queue_run_max = ${if = {1}{1} {5}{10}}
 queue_smtp_domains = x.y.z
 receive_timeout = 0s
 received_header_text = Received: ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}{${if def:sender_ident {from ${sender_ident} }}${if def:sender_helo_name {(helo=${sender_helo_name})\n\t}}}}by ${primary_hostname} ${if def:received_protocol {with ${received_protocol}}} (Exim ${version_number} #${compile_number})\n\tid ${message_id}${if def:received_for {\n\tfor $received_for}}
diff --git a/test/confs/0574 b/test/confs/0574
index 722988a29..289ed1955 100644
--- a/test/confs/0574
+++ b/test/confs/0574
@@ -13,12 +13,21 @@ tls_advertise_hosts =
 
 log_selector = +received_recipients +sender_on_delivery
 
-acl_smtp_rcpt = accept queue = ${if eq {normal}{$local_part} {} {$local_part}}
+acl_smtp_rcpt = rcpt
 queue_only
 queue_run_in_order
 
 #---------------
 
+begin acl
+
+rcpt:
+  accept
+    queue = ${if eq {normal}{$local_part} {} {$local_part}}
+    logwrite = using queue '$queue_name'
+
+#---------------
+
 begin routers
 
 all:
diff --git a/test/log/0574 b/test/log/0574
index 6b3ed743c..042d10c6e 100644
--- a/test/log/0574
+++ b/test/log/0574
@@ -1,4 +1,6 @@
+1999-03-02 09:44:33 using queue ''
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex
+1999-03-02 09:44:33 using queue 'alternate'
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmaX-0005vi-00 => normal <normal@test.ex> F=<CALLER@the.local.host.name> R=all T=dump
@@ -10,6 +12,7 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate <alternate@test.ex> F=<CALLER@the.local.host.name> Q=alternate R=all T=dump
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End 'alternate' queue run: pid=pppp
+1999-03-02 09:44:33 using queue 'lowpri'
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=lowpri for lowpri@test.ex
 
 ******** SERVER ********
diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
index 583adcff0..278a38660 100644
--- a/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@ -23,6 +23,7 @@ primary_hostname: ${primary_hostname}
 qualify_domain: $qualify_domain
 bounce_return_size_limit: ${bounce_return_size_limit}
 spool_directory: $spool_directory
+queue_name: $queue_name
 unknown: ${unknown}
 h_subject: $h_subject:(should be empty)
 h_subject:$h_subject (should be empty)
diff --git a/test/stdout/0002 b/test/stdout/0002
index 9a2768bdc..0bbd4c754 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -14,6 +14,7 @@
 > qualify_domain: myhost.test.ex
 > bounce_return_size_limit: 102400
 > spool_directory: TESTSUITE/spool
+> queue_name: 
 > Failed: unknown variable in "${unknown}"
 > h_subject: (should be empty)
 > h_subject: (should be empty)