X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fqueue.c;h=b2f7dda848d4981fd58a8885ae70eebcaf21cf9c;hb=5ca2a9a1a936ecc55402a1d40b7d8adb74865aba;hp=cfcb0440afb6f4de1d914af6bf8bc8e15866bec3;hpb=059ec3d9952740285fb1ebf47961b8aca2eb1b4a;p=exim.git diff --git a/src/src/queue.c b/src/src/queue.c index cfcb0440a..b2f7dda84 100644 --- a/src/src/queue.c +++ b/src/src/queue.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/queue.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */ +/* $Cambridge: exim/src/src/queue.c,v 1.5 2005/02/17 11:58:26 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2005 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions that operate on the input queue. */ @@ -615,6 +615,7 @@ for (i = (queue_run_in_order? -1 : 0); if ((pid = fork()) == 0) { int rc; + if (running_in_test_harness) millisleep(100); (void)close(pfd[pipe_read]); rc = deliver_message(f->text, force_delivery, FALSE); _exit(rc == DELIVER_NOT_ATTEMPTED); @@ -1190,7 +1191,11 @@ switch(action) if (deliver_datafile >= 0) printf("has been removed\n"); else printf("has been removed or did not exist\n"); - if (removed) log_write(0, LOG_MAIN, "removed by %s", username); + if (removed) + { + log_write(0, LOG_MAIN, "removed by %s", username); + log_write(0, LOG_MAIN, "Completed"); + } break;