dovecot-2.0: doveadm-expire: Improved debug logging.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/0c22286d5fc7
changeset: 12142:0c22286d5fc7
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Sep 21 14:55:33 2010 +0100
description:
doveadm-expire: Improved debug logging.

diffstat:

 src/plugins/expire/doveadm-expire.c |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r dc98970aef85 -r 0c22286d5fc7 src/plugins/expire/doveadm-expire.c
--- a/src/plugins/expire/doveadm-expire.c	Tue Sep 21 14:55:22 2010 +0100
+++ b/src/plugins/expire/doveadm-expire.c	Tue Sep 21 14:55:33 2010 +0100
@@ -339,6 +339,14 @@
 	if (expire_dict == NULL)
 		return;
 
+	if (ctx->iterate_single_user) {
+		if (doveadm_debug) {
+			i_debug("expire: Iterating only a single user, "
+				"ignoring expire database");
+		}
+		return;
+	}
+
 	ectx = p_new(ctx->pool, struct doveadm_expire_mail_cmd_context, 1);
 	ectx->module_ctx.super = ctx->v;
 	MODULE_CONTEXT_SET(ctx, doveadm_expire_mail_cmd_module, ectx);
@@ -347,7 +355,9 @@
 	   are valid for optimization. */
 	if (!doveadm_expire_analyze_query(ctx))
 		return;
-	i_debug("expire: Searching only users listed in expire database");
+
+	if (doveadm_debug)
+		i_debug("expire: Searching only users listed in expire database");
 
 	dict = dict_init(expire_dict, DICT_DATA_TYPE_UINT32, "",
 			 doveadm_settings->base_dir);