[dovecot-cvs] dovecot/src/lib-storage/subscription-file subscription-file.c, 1.28, 1.29

[cras at dovecot.org]

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

Modified Files:
	subscription-file.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: subscription-file.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/subscription-file/subscription-file.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- subscription-file.c	14 Jan 2006 18:47:58 -0000	1.28
+++ subscription-file.c	5 Feb 2006 12:46:09 -0000	1.29
@@ -14,7 +14,6 @@
 
 #define SUBSCRIPTION_FILE_LOCK_TIMEOUT 120
 #define SUBSCRIPTION_FILE_CHANGE_TIMEOUT 30
-#define SUBSCRIPTION_FILE_IMMEDIATE_TIMEOUT (5*60)
 
 struct subsfile_list_context {
 	pool_t pool;
@@ -85,7 +84,6 @@
 	dotlock_set.temp_prefix = temp_prefix;
 	dotlock_set.timeout = SUBSCRIPTION_FILE_LOCK_TIMEOUT;
 	dotlock_set.stale_timeout = SUBSCRIPTION_FILE_CHANGE_TIMEOUT;
-	dotlock_set.immediate_stale_timeout = SUBSCRIPTION_FILE_IMMEDIATE_TIMEOUT;
 
 	/* FIXME: set lock notification callback */
 	fd_out = file_dotlock_open(&dotlock_set, path, 0, &dotlock);