diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/exim.c | 8 | ||||
| -rw-r--r-- | src/src/queue.c | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/src/exim.c b/src/src/exim.c index 6432a4c2f..e4597c287 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -3243,7 +3243,7 @@ for (i = 1; i < argc; i++) if (*argrest == 'G') { - queue_name = string_copy(argrest); + queue_name = string_copy(argrest+1); do ++argrest; while (*argrest); } @@ -4675,7 +4675,11 @@ if (queue_interval == 0 && !daemon_listen) (start_queue_run_id == NULL)? US"" : start_queue_run_id, (stop_queue_run_id == NULL)? US"" : US" stopping at ", (stop_queue_run_id == NULL)? US"" : stop_queue_run_id); - set_process_info("running the queue (single queue run)"); + if (*queue_name) + set_process_info(CS string_sprintf( + "running the '%s' queue (single queue run)", queue_name)); + else + set_process_info("running the queue (single queue run)"); queue_run(start_queue_run_id, stop_queue_run_id, FALSE); exim_exit(EXIT_SUCCESS); } diff --git a/src/src/queue.c b/src/src/queue.c index c97179092..b6dff1107 100644 --- a/src/src/queue.c +++ b/src/src/queue.c @@ -391,7 +391,11 @@ if (!recurse) } log_detail = string_copy(big_buffer); - log_write(L_queue_run, LOG_MAIN, "Start queue run: %s", log_detail); + if (*queue_name) + log_write(L_queue_run, LOG_MAIN, "Start '%s' queue run: %s", + queue_name, log_detail); + else + log_write(L_queue_run, LOG_MAIN, "Start queue run: %s", log_detail); } /* If deliver_selectstring is a regex, compile it. */ @@ -700,7 +704,12 @@ if (queue_2stage) /* At top level, log the end of the run. */ -if (!recurse) log_write(L_queue_run, LOG_MAIN, "End queue run: %s", log_detail); +if (!recurse) + if (*queue_name) + log_write(L_queue_run, LOG_MAIN, "End '%s' queue run: %s", + queue_name, log_detail); + else + log_write(L_queue_run, LOG_MAIN, "End queue run: %s", log_detail); } |