From: Marko Kreen <markokr@gmail.com>
Date: Wed, 26 Oct 2011 08:51:30 +0000 (+0300)
Subject: Document KILL cmd, mention per-db pause.
X-Git-Tag: pgbouncer_1_5_rc1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35ed2b07d19b171125c1c71c10606a0067340c9a;p=pgbouncer

Document KILL cmd, mention per-db pause.
---

diff --git a/doc/usage.txt b/doc/usage.txt
index 013210a..6810c43 100644
--- a/doc/usage.txt
+++ b/doc/usage.txt
@@ -413,19 +413,25 @@ changeable::
 
 === PROCESS CONTROLLING COMMANDS ===
 
-==== PAUSE; ====
+==== PAUSE [db]; ====
 
 PgBouncer tries to disconnect from all servers, first waiting for all queries
 to complete. The command will not return before all queries are finished.  To be used
 at the time of database restart.
 
+If database name is given, only that database will be paused.
+
+==== KILL db; ====
+
+Immediately drop all client and server connections on given database.
+
 ==== SUSPEND; ====
 
 All socket buffers are flushed and PgBouncer stops listening for data on them.
 The command will not return before all buffers are empty.  To be used at the time
 of PgBouncer online reboot.
 
-==== RESUME; ====
+==== RESUME [db]; ====
 
 Resume work from previous +PAUSE+ or +SUSPEND+ command.
 
diff --git a/src/admin.c b/src/admin.c
index 7a8141f..c8340ca 100644
--- a/src/admin.c
+++ b/src/admin.c
@@ -1016,8 +1016,9 @@ static bool admin_show_help(PgSocket *admin, const char *arg)
 		"\tSET key = arg\n"
 		"\tRELOAD\n"
 		"\tPAUSE [<db>]\n"
-		"\tSUSPEND\n"
 		"\tRESUME [<db>]\n"
+		"\tKILL <db>\n"
+		"\tSUSPEND\n"
 		"\tSHUTDOWN", "");
 	if (res)
 		res = admin_ready(admin, "SHOW");