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 (from parent 1:
cfc5483
)
Added some extra debugging when updating a wait-xxx database.
author
Philip Hazel
<ph10@hermes.cam.ac.uk>
Tue, 31 Oct 2006 12:16:26 +0000
(12:16 +0000)
committer
Philip Hazel
<ph10@hermes.cam.ac.uk>
Tue, 31 Oct 2006 12:16:26 +0000
(12:16 +0000)
doc/doc-txt/ChangeLog
patch
|
blob
|
history
src/src/transport.c
patch
|
blob
|
history
test/stderr/0450
patch
|
blob
|
history
test/stderr/0476
patch
|
blob
|
history
test/stderr/0512
patch
|
blob
|
history
diff --git
a/doc/doc-txt/ChangeLog
b/doc/doc-txt/ChangeLog
index 57f603b7b79654c8dd61a4e856251161fbc93118..5f8d427d699231bd4b895ae34208c8f6396d8153 100644
(file)
--- a/
doc/doc-txt/ChangeLog
+++ b/
doc/doc-txt/ChangeLog
@@
-1,4
+1,4
@@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.42
0 2006/10/31 11:14:17
ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.42
1 2006/10/31 12:16:26
ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
Change log file for Exim from version 4.21
-------------------------------------------
@@
-220,6
+220,8
@@
PH/30 Exim was sometimes attempting to deliver messages that had suffered
PH/31 Installed Andrew Findlay's patch to close the writing end of the socket
in ${readsocket because some servers need this prod.
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
-----------------
Exim version 4.63
-----------------
diff --git
a/src/src/transport.c
b/src/src/transport.c
index 03d73f9ba28751a5b860991c137c591c3c74a1b4..f9a093e3b6995aae568b156c44b2364961aff6d0 100644
(file)
--- a/
src/src/transport.c
+++ b/
src/src/transport.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/transport.c,v 1.1
7 2006/10/30 22:06:33 tom
Exp $ */
+/* $Cambridge: exim/src/src/transport.c,v 1.1
8 2006/10/31 12:16:26 ph10
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-1433,6
+1433,8
@@
host_item *host;
open_db dbblock;
open_db *dbm_file;
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);
/* Open the database for this transport */
sprintf(CS buffer, "wait-%.200s", tpname);
@@
-1498,7
+1500,11
@@
for (host = hostlist; host!= NULL; host = host->next)
/* If this message is already in a record, no need to update. */
/* 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
/* If this record is full, write it out with a new name constructed
@@
-1534,6
+1540,7
@@
for (host = hostlist; host!= NULL; host = host->next)
/* Update the database */
dbfn_write(dbm_file, host->name, host_record, sizeof(dbdata_wait) + host_length);
/* 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 */
}
/* All now done */
diff --git
a/test/stderr/0450
b/test/stderr/0450
index 50d53193f8f66c0fb910752b0e10589cc407aab4..aeadb6ff25c7f90b0ab359fe847da91697665765 100644
(file)
--- a/
test/stderr/0450
+++ b/
test/stderr/0450
@@
-22,6
+22,8
@@
LOG: MAIN
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
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@test.ex R=r1 T=t1 defer (dd): Connection refused
Leaving t1 transport
LOG: MAIN
== userx@test.ex R=r1 T=t1 defer (dd): Connection refused
@@
-48,6
+50,8
@@
LOG: MAIN
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
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@test.ex R=r1 T=t1 defer (dd): Connection refused
Leaving t1 transport
LOG: MAIN
== userx@test.ex R=r1 T=t1 defer (dd): Connection refused
diff --git
a/test/stderr/0476
b/test/stderr/0476
index d01306485c485651ea1826483efe6d843ce2f18d..a0e57bd4a6ee29b08ec699f33ba5fe2c7a842e83 100644
(file)
--- a/
test/stderr/0476
+++ b/
test/stderr/0476
@@
-72,6
+72,8
@@
LOG: MAIN
set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for CALLER@the.local.host.name: 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
set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for CALLER@the.local.host.name: 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@the.local.host.name in subprocess)
set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish
Leaving t1 transport
set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@the.local.host.name in subprocess)
set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish
@@
-100,6
+102,8
@@
host retry time not reached: checking ultimate address timeout
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
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@test.ex in subprocess)
set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
Leaving t1 transport
set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@test.ex in subprocess)
set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
diff --git
a/test/stderr/0512
b/test/stderr/0512
index 6307ddafb47668fb8f39a6daee9a1efb2e0e6139..c1da4dc3e66ebe3a5f7a61e8e69909e3d6cf9335 100644
(file)
--- a/
test/stderr/0512
+++ b/
test/stderr/0512
@@
-52,6
+52,8
@@
LOG: MAIN
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
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@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused
Leaving t1 transport
LOG: MAIN
== userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused
@@
-113,6
+115,8
@@
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=
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
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@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused
Leaving t1 transport
LOG: MAIN
== userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused