ph10 2006/10/31 12:16:27 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src transport.c
exim-test/stderr 0450 0476 0512
Log:
Added some extra debugging when updating a wait-xxx database.
Revision Changes Path
1.421 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.18 +8 -1 exim/exim-src/src/transport.c
1.2 +4 -0 exim/exim-test/stderr/0450
1.7 +4 -0 exim/exim-test/stderr/0476
1.4 +4 -0 exim/exim-test/stderr/0512
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- ChangeLog 31 Oct 2006 11:14:17 -0000 1.420
+++ ChangeLog 31 Oct 2006 12:16:26 -0000 1.421
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.420 2006/10/31 11:14:17 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.421 2006/10/31 12:16:26 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -219,6 +219,8 @@
PH/31 Installed Andrew Findlay's patch to close the writing end of the socket
in ${readsocket because some servers need this prod.
+
+PH/32 Added some extra debug output when updating a wait-xxx database.
Exim version 4.63
Index: transport.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transport.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- transport.c 30 Oct 2006 22:06:33 -0000 1.17
+++ transport.c 31 Oct 2006 12:16:26 -0000 1.18
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transport.c,v 1.17 2006/10/30 22:06:33 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/transport.c,v 1.18 2006/10/31 12:16:26 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1433,6 +1433,8 @@
open_db dbblock;
open_db *dbm_file;
+DEBUG(D_transport) debug_printf("updating wait-%s database\n", tpname);
+
/* Open the database for this transport */
sprintf(CS buffer, "wait-%.200s", tpname);
@@ -1498,7 +1500,11 @@
/* If this message is already in a record, no need to update. */
- if (already) continue;
+ if (already)
+ {
+ DEBUG(D_transport) debug_printf("already listed for %s\n", host->name);
+ continue;
+ }
/* If this record is full, write it out with a new name constructed
@@ -1534,6 +1540,7 @@
/* Update the database */
dbfn_write(dbm_file, host->name, host_record, sizeof(dbdata_wait) + host_length);
+ DEBUG(D_transport) debug_printf("added to list for %s\n", host->name);
}
/* All now done */
Index: 0450
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0450,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0450 7 Feb 2006 10:47:31 -0000 1.1
+++ 0450 31 Oct 2006 12:16:26 -0000 1.2
@@ -22,6 +22,8 @@
127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2
all IP addresses skipped or deferred at least one address
+updating wait-t1 database
+added to list for 127.0.0.1
Leaving t1 transport
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
@@ -48,6 +50,8 @@
127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1226: errno=dd more_errno=dd,A flags=2
all IP addresses skipped or deferred at least one address
+updating wait-t1 database
+already listed for 127.0.0.1
Leaving t1 transport
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
Index: 0476
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0476,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0476 26 Jul 2006 14:39:14 -0000 1.6
+++ 0476 31 Oct 2006 12:16:26 -0000 1.7
@@ -72,6 +72,8 @@
set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for CALLER@???: result DEFER
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
all IP addresses skipped or deferred at least one address
+updating wait-t1 database
+added to list for 127.0.0.1
Leaving t1 transport
set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@??? in subprocess)
set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish
@@ -100,6 +102,8 @@
received_time=tttt diff=tttt timeout=86400
127.0.0.1 [127.0.0.1]:1111 status = unusable
all IP addresses skipped or deferred at least one address
+updating wait-t1 database
+added to list for 127.0.0.1
Leaving t1 transport
set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@??? in subprocess)
set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
Index: 0512
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0512,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0512 26 Jul 2006 14:39:14 -0000 1.3
+++ 0512 31 Oct 2006 12:16:26 -0000 1.4
@@ -52,6 +52,8 @@
127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
all IP addresses skipped or deferred at least one address
+updating wait-t1 database
+already listed for 127.0.0.1
Leaving t1 transport
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
@@ -113,6 +115,8 @@
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
all IP addresses skipped or deferred at least one address
hosts_max_try_hardlimit reached: behave as if all hosts were tried
+updating wait-t1 database
+already listed for 127.0.0.1
Leaving t1 transport
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
