dovecot-2.2: imap: When logging command disconnection info, log ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d204b943dd21
changeset: 19416:d204b943dd21
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Nov 24 13:42:58 2015 +0200
description:
imap: When logging command disconnection info, log the oldest command's info (not newest)

diffstat:

 src/imap/imap-client.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r ecfd706b0e21 -r d204b943dd21 src/imap/imap-client.c
--- a/src/imap/imap-client.c	Tue Nov 24 13:41:58 2015 +0200
+++ b/src/imap/imap-client.c	Tue Nov 24 13:42:58 2015 +0200
@@ -265,7 +265,7 @@
 
 static const char *client_get_commands_status(struct client *client)
 {
-	struct client_command_context *cmd;
+	struct client_command_context *cmd, *last_cmd = NULL;
 	unsigned int msecs_in_ioloop;
 	uint64_t running_usecs = 0, ioloop_wait_usecs;
 	unsigned long long bytes_in = 0, bytes_out = 0;
@@ -285,6 +285,7 @@
 		running_usecs += cmd->running_usecs;
 		bytes_in += cmd->bytes_in;
 		bytes_out += cmd->bytes_out;
+		last_cmd = cmd;
 	}
 
 	cond = io_loop_find_fd_conditions(current_ioloop, client->fd_out);
@@ -299,7 +300,7 @@
 
 	ioloop_wait_usecs = io_loop_get_wait_usecs(current_ioloop);
 	msecs_in_ioloop = (ioloop_wait_usecs -
-		client->command_queue->start_ioloop_wait_usecs + 999) / 1000;
+		last_cmd->start_ioloop_wait_usecs + 999) / 1000;
 	str_printfa(str, " running for %d.%03d + waiting %s for %d.%03d secs",
 		    (int)((running_usecs+999)/1000 / 1000),
 		    (int)((running_usecs+999)/1000 % 1000), cond_str,
@@ -307,7 +308,7 @@
 	str_printfa(str, ", %llu B in + %llu+%"PRIuSIZE_T" B out, state=%s)",
 		    bytes_in, bytes_out,
 		    o_stream_get_buffer_used_size(client->output),
-		    client_command_state_names[client->command_queue->state]);
+		    client_command_state_names[last_cmd->state]);
 	return str_c(str);
 }