]> granicus.if.org Git - pgbouncer/commitdiff
proper log message for console client cancel
authorMarko Kreen <markokr@gmail.com>
Mon, 4 Aug 2008 08:56:53 +0000 (08:56 +0000)
committerMarko Kreen <markokr@gmail.com>
Mon, 4 Aug 2008 08:56:53 +0000 (08:56 +0000)
src/objects.c

index 36f51ac45e67161659e30c334f9f89f76c6a1770..9178ff2f668eeb4f65b01edaf55797dde167a334 100644 (file)
@@ -857,14 +857,16 @@ found:
        /* not linked client, just drop it then */
        if (!main_client->link) {
                bool res;
-               disconnect_client(req, false, "cancel request for idle client");
 
                /* let administrative cancel be handled elsewhere */
                if (main_client->pool->db->admin) {
+                       disconnect_client(req, false, "cancel request for console client");
                        admin_handle_cancel(main_client);
                        return;
                }
 
+               disconnect_client(req, false, "cancel request for idle client");
+
                /* notify readiness */
                SEND_ReadyForQuery(res, main_client);
                if (!res)