dovecot-2.1: lib-master: Removed code to auto-drop instances fro...

dovecot at dovecot.org dovecot at dovecot.org
Mon Feb 6 21:45:55 EET 2012


details:   http://hg.dovecot.org/dovecot-2.1/rev/51c4e336c872
changeset: 14071:51c4e336c872
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Feb 06 21:45:49 2012 +0200
description:
lib-master: Removed code to auto-drop instances from the list.
There couldn't be any empty named instances, so it was a bit pointless.

diffstat:

 src/lib-master/master-instance.c |  21 ---------------------
 src/lib-master/master-instance.h |   2 --
 2 files changed, 0 insertions(+), 23 deletions(-)

diffs (57 lines):

diff -r 26885fe20e1f -r 51c4e336c872 src/lib-master/master-instance.c
--- a/src/lib-master/master-instance.c	Mon Feb 06 21:42:37 2012 +0200
+++ b/src/lib-master/master-instance.c	Mon Feb 06 21:45:49 2012 +0200
@@ -50,24 +50,6 @@
 	pool_unref(&list->pool);
 }
 
-static void master_instance_list_drop_stale(struct master_instance_list *list)
-{
-	const struct master_instance *instances;
-	unsigned int i, count;
-	time_t stale_timestamp = time(NULL) - MASTER_INSTANCE_AUTO_STALE_SECS;
-
-	instances = array_get(&list->instances, &count);
-	for (i = 0; i < count; ) {
-		if (instances[i].name[0] == '\0' &&
-		    instances[i].last_used < stale_timestamp) {
-			array_delete(&list->instances, i, 1);
-			instances = array_get(&list->instances, &count);
-		} else {
-			i++;
-		}
-	}
-}
-
 static int
 master_instance_list_add_line(struct master_instance_list *list,
 			      const char *line)
@@ -174,8 +156,6 @@
 	const char *lock_path = file_dotlock_get_lock_path(*dotlock);
 	int ret;
 
-	master_instance_list_drop_stale(list);
-
 	T_BEGIN {
 		ret = master_instance_list_write(list, fd, lock_path);
 	} T_END;
@@ -309,7 +289,6 @@
 	iter = i_new(struct master_instance_list_iter, 1);
 	iter->list = list;
 	(void)master_instance_list_refresh(list);
-	master_instance_list_drop_stale(list);
 	return iter;
 }
 
diff -r 26885fe20e1f -r 51c4e336c872 src/lib-master/master-instance.h
--- a/src/lib-master/master-instance.h	Mon Feb 06 21:42:37 2012 +0200
+++ b/src/lib-master/master-instance.h	Mon Feb 06 21:45:49 2012 +0200
@@ -2,8 +2,6 @@
 #define MASTER_INSTANCE_H
 
 #define MASTER_INSTANCE_PATH PKG_STATEDIR"/instances"
-/* Delete instances whose last_used is older than this and has no name. */
-#define MASTER_INSTANCE_AUTO_STALE_SECS (3600*24)
 
 struct master_instance_list;
 


More information about the dovecot-cvs mailing list