X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fqueue.c;h=b3dbd2c4ea8dcd30592bdcfcbdf84b3d2abe4c76;hb=36a3ae5f08725242b1fb4dfecc5617cc9c3e971b;hp=c234ffe26fee7f620baadef53733ae966c65e573;hpb=f1e894f37fb99398f7447220925a915bd031491a;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/queue.c b/src/src/queue.c index c234ffe26..b3dbd2c4e 100644 --- a/src/src/queue.c +++ b/src/src/queue.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/queue.c,v 1.8 2005/06/27 14:29:43 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions that operate on the input queue. */ @@ -453,7 +451,8 @@ for (i = (queue_run_in_order? -1 : 0); load_average = os_getloadavg(); if (load_average > deliver_queue_load_max) { - log_write(0, LOG_MAIN, "abandon queue run (load %.2f, max %.2f)", + log_write(L_queue_run, LOG_MAIN, "Abandon queue run: %s (load %.2f, max %.2f)", + log_detail, (double)load_average/1000.0, (double)deliver_queue_load_max/1000.0); i = subcount; /* Don't process other directories */ @@ -935,9 +934,9 @@ for (; f != NULL; f = f->next) * Act on a specific message * *************************************************/ -/* Actions that require a list of addresses make use of -argv/argc/recipients_arg. Other actions do not. This function does its -own authority checking. +/* Actions that require a list of addresses make use of argv/argc/ +recipients_arg. Other actions do not. This function does its own +authority checking. Arguments: id id of the message to work on @@ -1092,10 +1091,17 @@ username = (pw != NULL)? /* Take the necessary action. */ -printf("Message %s ", id); +if (action != MSG_SHOW_COPY) printf("Message %s ", id); switch(action) { + case MSG_SHOW_COPY: + deliver_in_buffer = store_malloc(DELIVER_IN_BUFFER_SIZE); + deliver_out_buffer = store_malloc(DELIVER_OUT_BUFFER_SIZE); + transport_write_message(NULL, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, 0); + break; + + case MSG_FREEZE: if (deliver_freeze) {