dovecot-2.2: fts-solr: Reverted previous change, it only crashes.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Feb 1 02:25:29 EET 2013
details: http://hg.dovecot.org/dovecot-2.2/rev/78bdcb6642c7
changeset: 15712:78bdcb6642c7
user: Timo Sirainen <tss at iki.fi>
date: Fri Feb 01 02:25:18 2013 +0200
description:
fts-solr: Reverted previous change, it only crashes.
The plugin is already unloaded at lib_atexit() time.
diffstat:
src/plugins/fts-solr/fts-backend-solr-old.c | 9 +--------
src/plugins/fts-solr/fts-backend-solr.c | 9 +--------
2 files changed, 2 insertions(+), 16 deletions(-)
diffs (54 lines):
diff -r e62a7ca7d1f2 -r 78bdcb6642c7 src/plugins/fts-solr/fts-backend-solr-old.c
--- a/src/plugins/fts-solr/fts-backend-solr-old.c Fri Feb 01 02:18:54 2013 +0200
+++ b/src/plugins/fts-solr/fts-backend-solr-old.c Fri Feb 01 02:25:18 2013 +0200
@@ -225,11 +225,6 @@
return &backend->backend;
}
-static void fts_backend_solr_connection_deinit(void)
-{
- solr_connection_deinit(solr_conn);
-}
-
static int
fts_backend_solr_init(struct fts_backend *_backend,
const char **error_r ATTR_UNUSED)
@@ -239,10 +234,8 @@
const struct fts_solr_settings *set = &fuser->set;
const char *str;
- if (solr_conn == NULL) {
+ if (solr_conn == NULL)
solr_conn = solr_connection_init(set->url, set->debug);
- lib_atexit(fts_backend_solr_connection_deinit);
- }
str = solr_escape_id_str(_backend->ns->user->username);
backend->id_username = i_strdup(str);
diff -r e62a7ca7d1f2 -r 78bdcb6642c7 src/plugins/fts-solr/fts-backend-solr.c
--- a/src/plugins/fts-solr/fts-backend-solr.c Fri Feb 01 02:18:54 2013 +0200
+++ b/src/plugins/fts-solr/fts-backend-solr.c Fri Feb 01 02:25:18 2013 +0200
@@ -150,11 +150,6 @@
return &backend->backend;
}
-static void fts_backend_solr_connection_deinit(void)
-{
- solr_connection_deinit(solr_conn);
-}
-
static int
fts_backend_solr_init(struct fts_backend *_backend,
const char **error_r ATTR_UNUSED)
@@ -162,10 +157,8 @@
struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(_backend->ns->user);
const struct fts_solr_settings *set = &fuser->set;
- if (solr_conn == NULL) {
+ if (solr_conn == NULL)
solr_conn = solr_connection_init(set->url, set->debug);
- lib_atexit(fts_backend_solr_connection_deinit);
- }
return 0;
}
More information about the dovecot-cvs
mailing list