From: Marko Kreen <markokr@gmail.com>
Date: Thu, 15 Mar 2007 14:48:48 +0000 (+0000)
Subject: immidiate suspend of logged in clients should be done bit differently
X-Git-Tag: pgbouncer_1_0_1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57e6fd0e0e8d93f5e1e062d387110067528d6f9a;p=pgbouncer

immidiate suspend of logged in clients should be done bit differently
---

diff --git a/src/janitor.c b/src/janitor.c
index 57d2d8d..2840397 100644
--- a/src/janitor.c
+++ b/src/janitor.c
@@ -37,6 +37,18 @@ static void close_server_list(StatList *sk_list, const char *reason)
 	}
 }
 
+bool suspend_socket(PgSocket *sk)
+{
+	if (!sk->suspended) {
+		if (sbuf_has_no_state(&sk->sbuf)) {
+			sbuf_pause(&sk->sbuf);
+			sk->suspended = 1;
+		} else
+			return false;
+	}
+	return true;
+}
+
 /* suspend all sockets in socket list */
 static int suspend_socket_list(StatList *list)
 {
@@ -46,13 +58,8 @@ static int suspend_socket_list(StatList *list)
 
 	statlist_for_each(item, list) {
 		sk = container_of(item, PgSocket, head);
-		if (!sk->suspended) {
-			if (sbuf_has_no_state(&sk->sbuf)) {
-				sbuf_pause(&sk->sbuf);
-				sk->suspended = 1;
-			} else
-				active++;
-		}
+		if (!suspend_socket(sk))
+			active++;
 	}
 	return active;
 }
diff --git a/src/janitor.h b/src/janitor.h
index 2c8ccd1..e37c6e1 100644
--- a/src/janitor.h
+++ b/src/janitor.h
@@ -20,4 +20,5 @@ void janitor_setup(void);
 void config_postprocess(void);
 void resume_all(void);
 void per_loop_object_maint(void);
+bool suspend_socket(PgSocket *sk);
 
diff --git a/src/objects.c b/src/objects.c
index 7222af3..e5e857f 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -758,7 +758,7 @@ bool finish_client_login(PgSocket *client)
 
 	/* in suspend, dont let send query */
 	if (cf_pause_mode == P_SUSPEND)
-		pause_client(client);
+		suspend_socket(client);
 
 	return true;
 }