git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log queue_time and queue_time_overall exclusive of receive time. Bug 2672
[exim.git]
/
src
/
src
/
receive.c
diff --git
a/src/src/receive.c
b/src/src/receive.c
index 3e950ffc6e86280a8487848a18a4cd4eb939b0cb..ce7da57192afa77b5afff9b9d6a760e5d70061ec 100644
(file)
--- a/
src/src/receive.c
+++ b/
src/src/receive.c
@@
-3272,7
+3272,7
@@
if (fflush(spool_data_file) == EOF || ferror(spool_data_file) ||
/* No I/O errors were encountered while writing the data file. */
DEBUG(D_receive) debug_printf("Data file written for message %s\n", message_id);
/* No I/O errors were encountered while writing the data file. */
DEBUG(D_receive) debug_printf("Data file written for message %s\n", message_id);
-
if (LOGGING(receive_time)) timesince(&received_time_taken, &received_time
);
+
gettimeofday(&received_time_complete, NULL
);
/* If there were any bad addresses extracted by -t, or there were no recipients
/* If there were any bad addresses extracted by -t, or there were no recipients
@@
-4050,7
+4050,11
@@
if (LOGGING(dkim) && arc_state && Ustrcmp(arc_state, "pass") == 0)
#endif
if (LOGGING(receive_time))
#endif
if (LOGGING(receive_time))
- g = string_append(g, 2, US" RT=", string_timediff(&received_time_taken));
+ {
+ struct timeval diff = received_time_complete;
+ timediff(&diff, &received_time);
+ g = string_append(g, 2, US" RT=", string_timediff(&diff));
+ }
if (*queue_name)
g = string_append(g, 2, US" Q=", queue_name);
if (*queue_name)
g = string_append(g, 2, US" Q=", queue_name);