From: Timo Sirainen <tss@iki.fi>
Date: Sat, 15 Nov 2008 17:22:33 +0000 (+0200)
Subject: Plugins: If mail_debug=yes, log "plugin disabled" if plugin's required setting isn... 
X-Git-Tag: 1.2.alpha4~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77c0730f0ef7c5de3ab1490874fdcc336b942de7;p=thirdparty%2Fdovecot%2Fcore.git

Plugins: If mail_debug=yes, log "plugin disabled" if plugin's required setting isn't set.

--HG--
branch : HEAD
---

diff --git a/src/plugins/acl/acl-plugin.c b/src/plugins/acl/acl-plugin.c
index 54fb09b73e..0fe0edb4e7 100644
--- a/src/plugins/acl/acl-plugin.c
+++ b/src/plugins/acl/acl-plugin.c
@@ -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 --git a/src/plugins/convert/convert-plugin.c b/src/plugins/convert/convert-plugin.c
index 46d0288661..e099566c7a 100644
--- a/src/plugins/convert/convert-plugin.c
+++ b/src/plugins/convert/convert-plugin.c
@@ -41,6 +41,8 @@ convert_hook_mail_namespaces_created(struct mail_namespace *namespaces)
 	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 --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c
index 4658f28e9c..942dfe0d8a 100644
--- a/src/plugins/expire/expire-plugin.c
+++ b/src/plugins/expire/expire-plugin.c
@@ -306,6 +306,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 --git a/src/plugins/fts/fts-plugin.c b/src/plugins/fts/fts-plugin.c
index ba9c44fb94..88071d5c2c 100644
--- a/src/plugins/fts/fts-plugin.c
+++ b/src/plugins/fts/fts-plugin.c
@@ -16,7 +16,7 @@ void fts_plugin_init(void)
 		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)
diff --git a/src/plugins/lazy-expunge/lazy-expunge-plugin.c b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
index 422f69c6b8..f9ba60f449 100644
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
@@ -586,8 +586,13 @@ static void lazy_expunge_mail_user_created(struct mail_user *user)
 
 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_init(void)
 
 void lazy_expunge_plugin_deinit(void)
 {
-	if (getenv("LAZY_EXPUNGE") == NULL)
+	if (getenv("LAZY_EXPUNGE") != NULL)
 		return;
 
 	hook_mail_namespaces_created =
diff --git a/src/plugins/mbox-snarf/mbox-snarf-plugin.c b/src/plugins/mbox-snarf/mbox-snarf-plugin.c
index f01d4994bd..8ceffa7add 100644
--- a/src/plugins/mbox-snarf/mbox-snarf-plugin.c
+++ b/src/plugins/mbox-snarf/mbox-snarf-plugin.c
@@ -191,7 +191,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 --git a/src/plugins/quota/quota-plugin.c b/src/plugins/quota/quota-plugin.c
index 52733cdca2..0a867b4593 100644
--- a/src/plugins/quota/quota-plugin.c
+++ b/src/plugins/quota/quota-plugin.c
@@ -67,8 +67,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_settings_init();
 
diff --git a/src/plugins/trash/trash-plugin.c b/src/plugins/trash/trash-plugin.c
index cc12d7b652..5dfb45f111 100644
--- a/src/plugins/trash/trash-plugin.c
+++ b/src/plugins/trash/trash-plugin.c
@@ -306,7 +306,7 @@ trash_hook_mail_namespaces_created(struct mail_namespace *namespaces)
 	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;
 	}