dovecot-1.1: Plugins: If mail_debug=yes, log "plugin disabled" i...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/ecdd82b6b3e0
changeset: 8008:ecdd82b6b3e0
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Nov 15 19:21:44 2008 +0200
description:
Plugins: If mail_debug=yes, log "plugin disabled" if plugin's required setting isn't set.

diffstat:

8 files changed, 22 insertions(+), 6 deletions(-)
src/plugins/acl/acl-plugin.c                   |    2 +-
src/plugins/convert/convert-plugin.c           |    2 ++
src/plugins/expire/expire-plugin.c             |    3 +++
src/plugins/fts/fts-storage.c                  |    2 ++
src/plugins/lazy-expunge/lazy-expunge-plugin.c |    9 +++++++--
src/plugins/mbox-snarf/mbox-snarf-plugin.c     |    3 ++-
src/plugins/quota/quota-plugin.c               |    5 ++++-
src/plugins/trash/trash-plugin.c               |    2 +-

diffs (117 lines):

diff -r ab868d7f8d11 -r ecdd82b6b3e0 src/plugins/acl/acl-plugin.c
--- a/src/plugins/acl/acl-plugin.c	Sat Nov 15 19:14:29 2008 +0200
+++ b/src/plugins/acl/acl-plugin.c	Sat Nov 15 19:21:44 2008 +0200
@@ -23,7 +23,7 @@ void acl_plugin_init(void)
 		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");
 	}
 }
 
diff -r ab868d7f8d11 -r ecdd82b6b3e0 src/plugins/convert/convert-plugin.c
--- a/src/plugins/convert/convert-plugin.c	Sat Nov 15 19:14:29 2008 +0200
+++ b/src/plugins/convert/convert-plugin.c	Sat Nov 15 19:21:44 2008 +0200
@@ -45,6 +45,8 @@ convert_hook_mail_namespaces_created(str
 	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);
diff -r ab868d7f8d11 -r ecdd82b6b3e0 src/plugins/expire/expire-plugin.c
--- a/src/plugins/expire/expire-plugin.c	Sat Nov 15 19:14:29 2008 +0200
+++ b/src/plugins/expire/expire-plugin.c	Sat Nov 15 19:21:44 2008 +0200
@@ -305,6 +305,9 @@ 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) {
+		i_info("expire: No expire or expire_altmove settings - "
+		       "plugin disabled");
 	}
 }
 
diff -r ab868d7f8d11 -r ecdd82b6b3e0 src/plugins/fts/fts-storage.c
--- a/src/plugins/fts/fts-storage.c	Sat Nov 15 19:14:29 2008 +0200
+++ b/src/plugins/fts/fts-storage.c	Sat Nov 15 19:21:44 2008 +0200
@@ -751,6 +751,8 @@ void fts_mailbox_opened(struct mailbox *
 	env = getenv("FTS");
 	if (env != NULL)
 		fts_mailbox_init(box, env);
+	else if (getenv("DEBUG") != NULL)
+		i_info("fts: No fts setting - plugin disabled");
 
 	if (fts_next_hook_mailbox_opened != NULL)
 		fts_next_hook_mailbox_opened(box);
diff -r ab868d7f8d11 -r ecdd82b6b3e0 src/plugins/lazy-expunge/lazy-expunge-plugin.c
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Sat Nov 15 19:14:29 2008 +0200
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Sat Nov 15 19:21:44 2008 +0200
@@ -558,8 +558,13 @@ lazy_expunge_hook_mail_namespaces_create
 
 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;
@@ -575,7 +580,7 @@ void lazy_expunge_plugin_init(void)
 
 void lazy_expunge_plugin_deinit(void)
 {
-	if (getenv("LAZY_EXPUNGE") == NULL)
+	if (getenv("LAZY_EXPUNGE") != NULL)
 		return;
 
 	hook_mail_namespaces_created =
diff -r ab868d7f8d11 -r ecdd82b6b3e0 src/plugins/mbox-snarf/mbox-snarf-plugin.c
--- a/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Sat Nov 15 19:14:29 2008 +0200
+++ b/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Sat Nov 15 19:21:44 2008 +0200
@@ -189,7 +189,8 @@ void mbox_snarf_plugin_init(void)
 		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)
diff -r ab868d7f8d11 -r ecdd82b6b3e0 src/plugins/quota/quota-plugin.c
--- a/src/plugins/quota/quota-plugin.c	Sat Nov 15 19:14:29 2008 +0200
+++ b/src/plugins/quota/quota-plugin.c	Sat Nov 15 19:21:44 2008 +0200
@@ -66,8 +66,11 @@ void quota_plugin_init(void)
 	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_init();
 
diff -r ab868d7f8d11 -r ecdd82b6b3e0 src/plugins/trash/trash-plugin.c
--- a/src/plugins/trash/trash-plugin.c	Sat Nov 15 19:14:29 2008 +0200
+++ b/src/plugins/trash/trash-plugin.c	Sat Nov 15 19:21:44 2008 +0200
@@ -294,7 +294,7 @@ trash_hook_mail_namespaces_created(struc
 	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;
 	}