From: Timo Sirainen <tss@iki.fi>
Date: Wed, 18 Nov 2015 16:54:51 +0000 (+0200)
Subject: stats: When logging UPDATE-SESSION stats, log also the session ID.
X-Git-Tag: 2.2.20.rc1~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abb242daeee0311e60c173efee02f70a19a60e9f;p=thirdparty%2Fdovecot%2Fcore.git

stats: When logging UPDATE-SESSION stats, log also the session ID.
---

diff --git a/src/stats/mail-session.c b/src/stats/mail-session.c
index cef05bc0b8..8d20637939 100644
--- a/src/stats/mail-session.c
+++ b/src/stats/mail-session.c
@@ -267,9 +267,9 @@ int mail_session_update_parse(const char *const *args, const char **error_r)
 	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 @@ int mail_session_update_parse(const char *const *args, const char **error_r)
 	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);