[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-uidlist.c, 1.43, 1.44

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv27670/lib-storage/index/maildir

Modified Files:
	maildir-uidlist.c 
Log Message:
Removed immediate_stale_timeout and changed the stale_timeout behavior to
check both dotlock and the file it protects, and overwrite the lock file
whenever neither of them have been modified for stale_timeout seconds (ie.
also immediately if their timestamps are old enough).



Index: maildir-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- maildir-uidlist.c	14 Jan 2006 18:47:50 -0000	1.43
+++ maildir-uidlist.c	5 Feb 2006 12:46:08 -0000	1.44
@@ -17,7 +17,7 @@
 #include <utime.h>
 
 /* how many seconds to wait before overriding uidlist.lock */
-#define UIDLIST_LOCK_STALE_TIMEOUT (60*5)
+#define UIDLIST_LOCK_STALE_TIMEOUT (60*2)
 
 #define UIDLIST_IS_LOCKED(uidlist) \
 	((uidlist)->lock_count > 0)
@@ -148,10 +148,8 @@
 				     maildir_hash, maildir_cmp);
 	uidlist->next_uid = 1;
 
-	uidlist->dotlock_settings.timeout = UIDLIST_LOCK_STALE_TIMEOUT;
+	uidlist->dotlock_settings.timeout = UIDLIST_LOCK_STALE_TIMEOUT + 2;
 	uidlist->dotlock_settings.stale_timeout = UIDLIST_LOCK_STALE_TIMEOUT;
-	uidlist->dotlock_settings.immediate_stale_timeout =
-		UIDLIST_LOCK_STALE_TIMEOUT;
 	uidlist->dotlock_settings.temp_prefix =
 		INDEX_STORAGE(mbox->storage)->temp_prefix;