dovecot-2.2: fts-solr: Deinit solr connection at plugin unload.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/1b671d03474d
changeset: 15713:1b671d03474d
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Feb 02 16:52:23 2013 +0200
description:
fts-solr: Deinit solr connection at plugin unload.

diffstat:

 src/plugins/fts-solr/fts-backend-solr-old.c |  2 --
 src/plugins/fts-solr/fts-backend-solr.c     |  2 --
 src/plugins/fts-solr/fts-solr-plugin.c      |  4 ++++
 src/plugins/fts-solr/fts-solr-plugin.h      |  1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 78bdcb6642c7 -r 1b671d03474d src/plugins/fts-solr/fts-backend-solr-old.c
--- a/src/plugins/fts-solr/fts-backend-solr-old.c	Fri Feb 01 02:25:18 2013 +0200
+++ b/src/plugins/fts-solr/fts-backend-solr-old.c	Sat Feb 02 16:52:23 2013 +0200
@@ -40,8 +40,6 @@
 	bool documents_added;
 };
 
-static struct solr_connection *solr_conn = NULL;
-
 static bool is_valid_xml_char(unichar_t chr)
 {
 	/* Valid characters in XML:
diff -r 78bdcb6642c7 -r 1b671d03474d src/plugins/fts-solr/fts-backend-solr.c
--- a/src/plugins/fts-solr/fts-backend-solr.c	Fri Feb 01 02:25:18 2013 +0200
+++ b/src/plugins/fts-solr/fts-backend-solr.c	Sat Feb 02 16:52:23 2013 +0200
@@ -50,8 +50,6 @@
 	unsigned int expunges:1;
 };
 
-static struct solr_connection *solr_conn = NULL;
-
 static bool is_valid_xml_char(unichar_t chr)
 {
 	/* Valid characters in XML:
diff -r 78bdcb6642c7 -r 1b671d03474d src/plugins/fts-solr/fts-solr-plugin.c
--- a/src/plugins/fts-solr/fts-solr-plugin.c	Fri Feb 01 02:25:18 2013 +0200
+++ b/src/plugins/fts-solr/fts-solr-plugin.c	Sat Feb 02 16:52:23 2013 +0200
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 
 const char *fts_solr_plugin_version = DOVECOT_ABI_VERSION;
+struct solr_connection *solr_conn = NULL;
 
 struct fts_solr_user_module fts_solr_user_module =
 	MODULE_CONTEXT_INIT(&mail_user_module_register);
@@ -82,6 +83,9 @@
 	fts_backend_unregister(fts_backend_solr.name);
 	fts_backend_unregister(fts_backend_solr_old.name);
 	mail_storage_hooks_remove(&fts_solr_mail_storage_hooks);
+	if (solr_conn != NULL)
+		solr_connection_deinit(solr_conn);
+
 }
 
 const char *fts_solr_plugin_dependencies[] = { "fts", NULL };
diff -r 78bdcb6642c7 -r 1b671d03474d src/plugins/fts-solr/fts-solr-plugin.h
--- a/src/plugins/fts-solr/fts-solr-plugin.h	Fri Feb 01 02:25:18 2013 +0200
+++ b/src/plugins/fts-solr/fts-solr-plugin.h	Sat Feb 02 16:52:23 2013 +0200
@@ -21,6 +21,7 @@
 extern struct fts_backend fts_backend_solr;
 extern struct fts_backend fts_backend_solr_old;
 extern MODULE_CONTEXT_DEFINE(fts_solr_user_module, &mail_user_module_register);
+extern struct solr_connection *solr_conn;
 
 void fts_solr_plugin_init(struct module *module);
 void fts_solr_plugin_deinit(void);