dovecot-2.2: stats: When logging UPDATE-SESSION stats, log also ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/109c23a7412a
changeset: 19394:109c23a7412a
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Nov 18 18:54:51 2015 +0200
description:
stats: When logging UPDATE-SESSION stats, log also the session ID.

diffstat:

 src/stats/mail-session.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 910656f4b7a0 -r 109c23a7412a src/stats/mail-session.c
--- a/src/stats/mail-session.c	Wed Nov 18 18:10:46 2015 +0200
+++ b/src/stats/mail-session.c	Wed Nov 18 18:54:51 2015 +0200
@@ -267,9 +267,9 @@
 	buf = buffer_create_dynamic(pool_datastack_create(), 256);
 	if (args[1] == NULL ||
 	    base64_decode(args[1], strlen(args[1]), NULL, buf) < 0) {
-		*error_r = t_strdup_printf("UPDATE-SESSION %s %s: Invalid base64 input",
+		*error_r = t_strdup_printf("UPDATE-SESSION %s %s %s: Invalid base64 input",
 					   session->user->name,
-					   session->service);
+					   session->service, session->id);
 		return -1;
 	}
 
@@ -277,16 +277,17 @@
 	diff_stats = stats_alloc(pool_datastack_create());
 
 	if (!stats_import(buf->data, buf->used, session->stats, new_stats, &error)) {
-		*error_r = t_strdup_printf("UPDATE-SESSION %s %s: %s",
+		*error_r = t_strdup_printf("UPDATE-SESSION %s %s %s: %s",
 					   session->user->name,
-					   session->service, error);
+					   session->service, session->id, error);
 		return -1;
 	}
 
 	if (!stats_diff(session->stats, new_stats, diff_stats, &error)) {
-		*error_r = t_strdup_printf("UPDATE-SESSION %s %s: stats shrank: %s",
+		*error_r = t_strdup_printf("UPDATE-SESSION %s %s %s: stats shrank: %s",
 					   session->user->name,
-					   session->service, error);
+					   session->service, session->id, error);
+		i_panic("%s", *error_r);
 		return -1;
 	}
 	mail_session_refresh(session, diff_stats);