diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-05-31 14:49:55 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-05-31 17:59:49 +0100 |
| commit | 4491547465eba8a542a10e854ddd4f02030050b1 (patch) | |
| tree | cc8f5e3391feddfad7ea564299d57d69fd3a9517 | |
| parent | aed6edfe7696f27b565c3318fe3cd22131e9314a (diff) | |
Support "-qGpostgresql -Mvl <id>" and a better exiwhat output
| -rw-r--r-- | src/src/daemon.c | 14 | ||||
| -rw-r--r-- | src/src/exim.c | 2 | ||||
| -rw-r--r-- | test/log/0576 | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/src/daemon.c b/src/src/daemon.c index a778c489d..779518f9f 100644 --- 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 38a1dedb6..1fb543f1b 100644 --- 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 042d10c6e..373f1d320 100644 --- 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 |