dovecot-1.2: expire: If mail_debug=yes, expire-tool shouldn't lo...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/dff7312629a7
changeset: 9190:dff7312629a7
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jul 07 15:00:52 2009 -0400
description:
expire: If mail_debug=yes, expire-tool shouldn't log about disabling expire plugin.

diffstat:

2 files changed, 3 insertions(+), 1 deletion(-)
src/plugins/expire/expire-plugin.c |    3 ++-
src/plugins/expire/expire-tool.c   |    1 +

diffs (24 lines):

diff -r ee173ea99ea6 -r dff7312629a7 src/plugins/expire/expire-plugin.c
--- a/src/plugins/expire/expire-plugin.c	Tue Jul 07 13:25:01 2009 -0400
+++ b/src/plugins/expire/expire-plugin.c	Tue Jul 07 15:00:52 2009 -0400
@@ -308,7 +308,8 @@ void expire_plugin_init(void)
 		expire.next_hook_mail_storage_created =
 			hook_mail_storage_created;
 		hook_mail_storage_created = expire_mail_storage_created;
-	} else if (getenv("DEBUG") != NULL) {
+	} else if (getenv("DEBUG") != NULL &&
+		   getenv("EXPIRE_TOOL_BINARY") == NULL) {
 		i_info("expire: No expire or expire_altmove settings - "
 		       "plugin disabled");
 	}
diff -r ee173ea99ea6 -r dff7312629a7 src/plugins/expire/expire-tool.c
--- a/src/plugins/expire/expire-tool.c	Tue Jul 07 13:25:01 2009 -0400
+++ b/src/plugins/expire/expire-tool.c	Tue Jul 07 15:00:52 2009 -0400
@@ -242,6 +242,7 @@ static void expire_run(bool testrun)
 	/* remove these so that expire plugin won't get used */
 	env_remove("EXPIRE");
 	env_remove("EXPIRE_ALTMOVE");
+	env_put("EXPIRE_TOOL_BINARY=1");
 
 	if (getenv("MAIL_PLUGINS") == NULL)
 		modules = NULL;