fixed the ps display to follow the order in PostgreSQL.

pgpool was showing

	pgpool: database user host status

but PostgreSQL shows

	postgres: user database host status

diff --git a/child.c b/child.c
index aead674a017e24fc8758b82b3fbcb6bb6fde73b6..3cc63986c861fed485dce40dff3de80db98a4416 100644 (file)
--- a/child.c
+++ b/child.c
@@ -365,7 +365,7 @@ void do_child(int unix_fd, int inet_fd)
                /* show ps status */
                sp = MASTER_CONNECTION(backend)->sp;
                snprintf(psbuf, sizeof(psbuf), "%s %s %s idle",
-                                sp->database, sp->user, remote_ps_data);
+                                sp->user, sp->database, remote_ps_data);
                set_ps_display(psbuf, false);
 
                /* query process loop */

diff --git a/pool_process_query.c b/pool_process_query.c
index ea0be17e2a5a7fd1d4f806c6bf222762d7dccded..530367e7d0e0e7d198f71ea8e8a69dd1cb618388 100644 (file)
--- a/pool_process_query.c
+++ b/pool_process_query.c
@@ -637,7 +637,7 @@ static POOL_STATUS Query(POOL_CONNECTION *frontend,
                /* show ps status */
                sp = MASTER_CONNECTION(backend)->sp;
                snprintf(psbuf, sizeof(psbuf), "%s %s %s idle",
-                                sp->database, sp->user, remote_ps_data);
+                                sp->user, sp->database, remote_ps_data);
                set_ps_display(psbuf, false);
                return POOL_CONTINUE;
        }
@@ -1091,10 +1091,10 @@ static POOL_STATUS ReadyForQuery(POOL_CONNECTION *frontend,
        sp = MASTER_CONNECTION(backend)->sp;
        if (MASTER(backend)->tstate == 'T')
                snprintf(psbuf, sizeof(psbuf), "%s %s %s idle in transaction", 
-                                sp->database, sp->user, remote_ps_data);
+                                sp->user, sp->database, remote_ps_data);
        else
                snprintf(psbuf, sizeof(psbuf), "%s %s %s idle", 
-                                sp->database, sp->user, remote_ps_data);
+                                sp->user, sp->database, remote_ps_data);
        set_ps_display(psbuf, false);
 
        return POOL_CONTINUE;
@@ -3812,7 +3812,8 @@ static void query_ps_status(char *query, POOL_CONNECTION_POOL *backend)
                return;
 
        sp = MASTER_CONNECTION(backend)->sp;
-       i = snprintf(psbuf, sizeof(psbuf), "%s %s %s ", sp->database, sp->user, remote_ps_data);
+       i = snprintf(psbuf, sizeof(psbuf), "%s %s %s ",
+                                sp->user, sp->database, remote_ps_data);
 
        /* skip spaces */
        while (*query && isspace(*query))