Mercurial > dovecot > original-hg > dovecot-1.2
changeset 9190:dff7312629a7 HEAD
expire: If mail_debug=yes, expire-tool shouldn't log about disabling expire plugin.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 07 Jul 2009 15:00:52 -0400 |
| parents | ee173ea99ea6 |
| children | b340ecb24469 |
| files | src/plugins/expire/expire-plugin.c src/plugins/expire/expire-tool.c |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ 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"); }
--- 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 @@ /* 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;