changeset 9130:73b9d8556f5a HEAD

Transaction log dotlocking ignored mail_nfs_index and dotlock_use_excl settings.
author Timo Sirainen <tss@iki.fi>
date Mon, 15 Jun 2009 20:46:51 -0400
parents 0cdb6c23683f
children c8bb7c18f17b
files src/lib-index/mail-transaction-log.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mail-transaction-log.c	Mon Jun 15 20:38:50 2009 -0400
+++ b/src/lib-index/mail-transaction-log.c	Mon Jun 15 20:46:51 2009 -0400
@@ -37,15 +37,12 @@
 	log = i_new(struct mail_transaction_log, 1);
 	log->index = index;
 
-	log->dotlock_settings.use_excl_lock = index->use_excl_dotlocks;
-	log->dotlock_settings.nfs_flush = index->nfs_flush;
 	log->dotlock_settings.timeout = MAIL_TRANSCATION_LOG_LOCK_TIMEOUT;
 	log->dotlock_settings.stale_timeout =
 		MAIL_TRANSCATION_LOG_LOCK_CHANGE_TIMEOUT;
 
 	log->new_dotlock_settings = log->dotlock_settings;
 	log->new_dotlock_settings.lock_suffix = LOG_NEW_DOTLOCK_SUFFIX;
-
 	return log;
 }
 
@@ -78,6 +75,11 @@
 	const char *path;
 	int ret;
 
+	log->dotlock_settings.use_excl_lock = log->index->use_excl_dotlocks;
+	log->dotlock_settings.nfs_flush = log->index->nfs_flush;
+	log->new_dotlock_settings.use_excl_lock = log->index->use_excl_dotlocks;
+	log->new_dotlock_settings.nfs_flush = log->index->nfs_flush;
+
 	if (log->open_file != NULL)
 		mail_transaction_log_file_free(&log->open_file);