From: Marko Kreen <markokr@gmail.com>
Date: Wed, 26 Oct 2011 08:38:48 +0000 (+0300)
Subject: Merge remote-tracking branch 'mtharp/rpath'
X-Git-Tag: pgbouncer_1_5_rc1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=156d22959d3f3664f4da014119c48345decf3ff5;p=pgbouncer

Merge remote-tracking branch 'mtharp/rpath'

Conflicts:
	src/janitor.c

Instead not flagging paused auto-db as inactive,
I moved the check to auto-db cleanup.
---

156d22959d3f3664f4da014119c48345decf3ff5
diff --cc src/janitor.c
index 6a41df1,f02f1bd..083da52
--- a/src/janitor.c
+++ b/src/janitor.c
@@@ -520,9 -502,8 +520,11 @@@ static void cleanup_inactive_autodataba
  	if (cf_autodb_idle_timeout <= 0)
  		return;
  
 +	/* now kill the old ones */
  	statlist_for_each_safe(item, &autodatabase_idle_list, tmp) {
  		db = container_of(item, PgDatabase, head);
++		if (db->db_paused)
++			continue;
  		age = now - db->inactive_time;
  		if (age > cf_autodb_idle_timeout) 
  			kill_database(db);