From: Timo Sirainen <tss@iki.fi>
Date: Tue, 6 Apr 2010 23:02:40 +0000 (+0300)
Subject: expire-tool: Improved -t output.
X-Git-Tag: 2.0.beta5~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=073265dedd33243515304bd3d25ce577e3b57d32;p=thirdparty%2Fdovecot%2Fcore.git

expire-tool: Improved -t output.

--HG--
branch : HEAD
---

diff --git a/src/plugins/expire/expire-tool.c b/src/plugins/expire/expire-tool.c
index badadd26ee..756af9e3b1 100644
--- a/src/plugins/expire/expire-tool.c
+++ b/src/plugins/expire/expire-tool.c
@@ -153,8 +153,11 @@ mailbox_delete_old_mails(struct expire_context *ctx, const char *user,
 			if (!ctx->testrun)
 				mail_expunge(mail);
 			else {
-				i_info("%s/%s: seq=%u uid=%u: Expunge",
-				       user, mailbox, mail->seq, mail->uid);
+				i_info("%s/%s: seq=%u uid=%u: Expunge "
+				       "(saved=%lu + expire=%u <= now=%lu)",
+				       user, mailbox, mail->seq, mail->uid,
+				       (unsigned long)save_time, expunge_secs,
+				       (unsigned long)now);
 			}
 		} else if (save_time + (time_t)altmove_secs <= now &&
 			   altmove_secs != 0) {
@@ -166,8 +169,11 @@ mailbox_delete_old_mails(struct expire_context *ctx, const char *user,
 				mail_update_flags(mail, MODIFY_ADD,
 						  MAIL_INDEX_MAIL_FLAG_BACKEND);
 			} else {
-				i_info("%s/%s: seq=%u uid=%u: Move to alt dir",
-				       user, mailbox, mail->seq, mail->uid);
+				i_info("%s/%s: seq=%u uid=%u: Move to alt dir"
+				       "(saved=%lu + altmove=%u <= now=%lu)",
+				       user, mailbox, mail->seq, mail->uid,
+				       (unsigned long)save_time, altmove_secs,
+				       (unsigned long)now);
 			}
 		} else {
 			/* first non-expired one. */