Document KILL cmd, mention per-db pause.

diff --git a/doc/usage.txt b/doc/usage.txt
index 013210a11c00ec12e26078f1fcabec531589f46c..6810c4329f7682fd9f440e4e7475366e08c91579 100644 (file)
--- 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 7a8141f7f4e43b043b82b6c7d7e763c0a4076fbc..c8340ca0f2945b1ad47e2ea383c3493ec7e4e83a 100644 (file)
--- 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");