Mercurial > dovecot > original-hg > dovecot-1.2

changeset 8404:d3cbd3494a8c HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Plugins: If mail_debug=yes, log "plugin disabled" if plugin's required setting isn't set.
author Timo Sirainen <tss@iki.fi>
date Sat, 15 Nov 2008 19:22:33 +0200
parents 88b15ab4b1d0
children cb742f826abd
files src/plugins/acl/acl-plugin.c src/plugins/convert/convert-plugin.c src/plugins/expire/expire-plugin.c src/plugins/fts/fts-plugin.c src/plugins/lazy-expunge/lazy-expunge-plugin.c src/plugins/mbox-snarf/mbox-snarf-plugin.c src/plugins/quota/quota-plugin.c src/plugins/trash/trash-plugin.c
diffstat 8 files changed, 21 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/acl/acl-plugin.c	Sat Nov 15 19:14:41 2008 +0200
+++ b/src/plugins/acl/acl-plugin.c	Sat Nov 15 19:22:33 2008 +0200
@@ -23,7 +23,7 @@
 		hook_mailbox_list_created = acl_mailbox_list_created;
 	} else {
 		if (getenv("DEBUG") != NULL)
-			i_info("acl: ACL environment not set");
+			i_info("acl: No acl setting - ACLs are disabled");
 	}
 }
 
--- a/src/plugins/convert/convert-plugin.c	Sat Nov 15 19:14:41 2008 +0200
+++ b/src/plugins/convert/convert-plugin.c	Sat Nov 15 19:22:33 2008 +0200
@@ -41,6 +41,8 @@
 	convert_mail = getenv("CONVERT_MAIL");
 	if (convert_mail != NULL)
 		convert_mail_storage(namespaces, convert_mail);
+	else if (getenv("DEBUG") != NULL)
+		i_info("convert: No convert_mail setting - plugin disabled");
 
 	if (convert_next_hook_mail_namespaces_created != NULL)
 		convert_next_hook_mail_namespaces_created(namespaces);
--- a/src/plugins/expire/expire-plugin.c	Sat Nov 15 19:14:41 2008 +0200
+++ b/src/plugins/expire/expire-plugin.c	Sat Nov 15 19:22:33 2008 +0200
@@ -306,6 +306,9 @@
 		expire.next_hook_mail_storage_created =
 			hook_mail_storage_created;
 		hook_mail_storage_created = expire_mail_storage_created;
+	} else if (getenv("DEBUG") != NULL) {
+		i_info("expire: No expire or expire_altmove settings - "
+		       "plugin disabled");
 	}
 }
 
--- a/src/plugins/fts/fts-plugin.c	Sat Nov 15 19:14:41 2008 +0200
+++ b/src/plugins/fts/fts-plugin.c	Sat Nov 15 19:22:33 2008 +0200
@@ -16,7 +16,7 @@
 		fts_next_hook_mailbox_opened = hook_mailbox_opened;
 		hook_mailbox_opened = fts_mailbox_opened;
 	} else if (getenv("DEBUG") != NULL)
-		i_info("fts: Missing fts setting, disabled");
+		i_info("fts: No fts setting - plugin disabled");
 }
 
 void fts_plugin_deinit(void)
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Sat Nov 15 19:14:41 2008 +0200
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Sat Nov 15 19:22:33 2008 +0200
@@ -586,8 +586,13 @@
 
 void lazy_expunge_plugin_init(void)
 {
-	if (getenv("LAZY_EXPUNGE") == NULL)
+	if (getenv("LAZY_EXPUNGE") == NULL) {
+		if (getenv("DEBUG") != NULL) {
+			i_info("lazy_expunge: No lazy_expunge setting - "
+			       "plugin disabled");
+		}
 		return;
+	}
 
 	lazy_expunge_next_hook_mail_namespaces_created =
 		hook_mail_namespaces_created;
@@ -606,7 +611,7 @@
 
 void lazy_expunge_plugin_deinit(void)
 {
-	if (getenv("LAZY_EXPUNGE") == NULL)
+	if (getenv("LAZY_EXPUNGE") != NULL)
 		return;
 
 	hook_mail_namespaces_created =
--- a/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Sat Nov 15 19:14:41 2008 +0200
+++ b/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Sat Nov 15 19:22:33 2008 +0200
@@ -191,7 +191,8 @@
 		mbox_snarf_next_hook_mail_storage_created =
 			hook_mail_storage_created;
 		hook_mail_storage_created = mbox_snarf_mail_storage_created;
-	}
+	} else if (getenv("DEBUG") != NULL)
+		i_info("mbox_snarf: No mbox_snarf setting - plugin disabled");
 }
 
 void mbox_snarf_plugin_deinit(void)
--- a/src/plugins/quota/quota-plugin.c	Sat Nov 15 19:14:41 2008 +0200
+++ b/src/plugins/quota/quota-plugin.c	Sat Nov 15 19:22:33 2008 +0200
@@ -67,8 +67,11 @@
 	const char *env;
 
 	env = getenv("QUOTA");
-	if (env == NULL)
+	if (env == NULL) {
+		if (getenv("DEBUG") != NULL)
+			i_info("quota: No quota setting - plugin disabled");
 		return;
+	}
 
 	quota_set = quota_settings_init();
 
--- a/src/plugins/trash/trash-plugin.c	Sat Nov 15 19:14:41 2008 +0200
+++ b/src/plugins/trash/trash-plugin.c	Sat Nov 15 19:22:33 2008 +0200
@@ -306,7 +306,7 @@
 	env = getenv("TRASH");
 	if (env == NULL) {
 		if (getenv("DEBUG") != NULL)
-			i_info("trash plugin: No trash setting, disabled");
+			i_info("trash: No trash setting - plugin disabled");
 		return;
 	}