git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ef3a1a3
)
Named queues: Add queue name to "queued by ACL" log line
author
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 20 Jul 2016 11:40:28 +0000
(12:40 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 3 Aug 2016 23:18:39 +0000
(
00:18
+0100)
src/src/receive.c
patch
|
blob
|
history
diff --git
a/src/src/receive.c
b/src/src/receive.c
index a59fbc991bc89eec236037ee8e215d9ffdbdf4fc..6c214152ae85d4b4ab7bce3dd03f0371d22d7ad2 100644
(file)
--- a/
src/src/receive.c
+++ b/
src/src/receive.c
@@
-3894,7
+3894,9
@@
if (message_logs && blackholed_by == NULL)
if (deliver_freeze) fprintf(message_log, "%s frozen by %s\n", now,
frozen_by);
if (queue_only_policy) fprintf(message_log,
if (deliver_freeze) fprintf(message_log, "%s frozen by %s\n", now,
frozen_by);
if (queue_only_policy) fprintf(message_log,
- "%s no immediate delivery: queued by %s\n", now, queued_by);
+ "%s no immediate delivery: queued%s%s by %s\n", now,
+ *queue_name ? " in " : "", *queue_name ? CS queue_name : "",
+ queued_by);
(void)fclose(message_log);
}
}
(void)fclose(message_log);
}
}
@@
-4014,7
+4016,9
@@
if(!smtp_reply)
if (deliver_freeze) log_write(0, LOG_MAIN, "frozen by %s", frozen_by);
if (queue_only_policy) log_write(L_delay_delivery, LOG_MAIN,
if (deliver_freeze) log_write(0, LOG_MAIN, "frozen by %s", frozen_by);
if (queue_only_policy) log_write(L_delay_delivery, LOG_MAIN,
- "no immediate delivery: queued by %s", queued_by);
+ "no immediate delivery: queued%s%s by %s",
+ *queue_name ? " in " : "", *queue_name ? CS queue_name : "",
+ queued_by);
}
receive_call_bombout = FALSE;
}
receive_call_bombout = FALSE;