Support "-qGpostgresql -Mvl <id>" and a better exiwhat output

diff --git a/src/src/daemon.c b/src/src/daemon.c
index a778c489df7bf6d4f2e28df6c997d91323286225..779518f9f3b3c607599a19fd359182880cae2d2b 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -1688,17 +1688,19 @@ else if (daemon_listen)
   log_write(0, LOG_MAIN,
     "exim %s daemon started: pid=%d, %s, listening for %s",
     version_string, getpid(), qinfo, big_buffer);
-  set_process_info("daemon(%s): %s, listening for %s", version_string, qinfo, big_buffer);
+  set_process_info("daemon(%s): %s, listening for %s",
+    version_string, qinfo, big_buffer);
   }
 
 else
   {
+  uschar * s = *queue_name
+    ? string_sprintf("-qG%s/%s", queue_name, readconf_printtime(queue_interval))
+    : string_sprintf("-q%s", readconf_printtime(queue_interval));
   log_write(0, LOG_MAIN,
-    "exim %s daemon started: pid=%d, -q%s, not listening for SMTP",
-    version_string, getpid(), readconf_printtime(queue_interval));
-  set_process_info("daemon(%s): -q%s, not listening",
-    version_string,
-    readconf_printtime(queue_interval));
+    "exim %s daemon started: pid=%d, %s, not listening for SMTP",
+    version_string, getpid(), s);
+  set_process_info("daemon(%s): %s, not listening", version_string, s);
   }
 
 /* Do any work it might be useful to amortize over our children

diff --git a/src/src/exim.c b/src/src/exim.c
index 38a1dedb6f9d79257bfe72f6266f66c147895659..1fb543f1b8e4393b0a58d085efc5022f0969afed 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -3488,7 +3488,7 @@ if ((
     ) ||
     (
     msg_action_arg > 0 &&
-    (daemon_listen || queue_interval >= 0 || list_options ||
+    (daemon_listen || queue_interval > 0 || list_options ||
       (checking && msg_action != MSG_LOAD) ||
       bi_option || test_retry_arg >= 0 || test_rewrite_arg >= 0)
     ) ||

diff --git a/test/log/0576 b/test/log/0576
index 042d10c6ed0050525798d1359ee9d4c510a0a8df..373f1d32009ca8024bf5fc37202594da7afdaa96 100644 (file)
--- a/test/log/0576
+++ b/test/log/0576
@@ -16,7 +16,7 @@
 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 ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -q3s, not listening for SMTP
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -qGlowpri/3s, not listening for SMTP
 1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp
 1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp
 1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp