database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Fix pg_isready to handle conninfo properly.

Browse Source 
pg_isready displays the host name and the port number that it uses to connect
to the server. So far, pg_isready didn't use the conninfo specified in -d option
for calculating those host name and port number. This can lead to wrong display
to a user. This commit changes pg_isready so that it uses the conninfo for that
calculation.

Original patch by Phil Sorber, modified by me.
This commit is contained in:
Fujii Masao
2013-06-11 03:03:16 +09:00
parent 33a4466f76
commit 941c4ece98
1 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
src/bin/scripts/pg_isready.c
View File

@@ -20,9 +20,7 @@ static void
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int c, int c;
optindex,
opt_index = 2;
const char *progname; const char *progname;
@@ -32,14 +30,22 @@ main(int argc, char **argv)
const char *pgdbname = NULL; const char *pgdbname = NULL;
const char *connect_timeout = DEFAULT_CONNECT_TIMEOUT; const char *connect_timeout = DEFAULT_CONNECT_TIMEOUT;
const char *keywords[7] = {NULL}; const char *pghost_str = NULL;
const char *values[7] = {NULL}; const char *pgport_str = NULL;
#define PARAMS_ARRAY_SIZE 7
const char *keywords[PARAMS_ARRAY_SIZE];
const char *values[PARAMS_ARRAY_SIZE];
bool quiet = false; bool quiet = false;
PGPing rv; PGPing rv;
PQconninfoOption *connect_options, PQconninfoOption *opts = NULL;
*conn_opt_ptr; PQconninfoOption *defs = NULL;
PQconninfoOption *opt;
PQconninfoOption *def;
char *errmsg = NULL;
/* /*
* We accept user and database as options to avoid useless errors from * We accept user and database as options to avoid useless errors from
@@ -60,7 +66,7 @@ main(int argc, char **argv)
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pgscripts")); set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pgscripts"));
handle_help_version_opts(argc, argv, progname, help); handle_help_version_opts(argc, argv, progname, help);
while ((c = getopt_long(argc, argv, "d:h:p:qt:U:V", long_options, &optindex)) != -1) while ((c = getopt_long(argc, argv, "d:h:p:qt:U:", long_options, NULL)) != -1)
{ {
switch (c) switch (c)
{ {
@@ -106,66 +112,74 @@ main(int argc, char **argv)
exit(PQPING_NO_ATTEMPT); exit(PQPING_NO_ATTEMPT);
} }
/* keywords[0] = "host";
* Set connection options values[0] = pghost;
*/ keywords[1] = "port";
values[1] = pgport;
keywords[2] = "user";
values[2] = pguser;
keywords[3] = "dbname";
values[3] = pgdbname;
keywords[4] = "connect_timeout";
values[4] = connect_timeout;
keywords[5] = "fallback_application_name";
values[5] = progname;
keywords[6] = NULL;
values[6] = NULL;
keywords[0] = "connect_timeout"; /*
values[0] = connect_timeout; * Get the host and port so we can display them in our output
keywords[1] = "fallback_application_name"; */
values[1] = progname;
if (pguser)
{
keywords[opt_index] = "user";
values[opt_index] = pguser;
opt_index++;
}
if (pgdbname) if (pgdbname)
{ {
keywords[opt_index] = "dbname"; opts = PQconninfoParse(pgdbname, &errmsg);
values[opt_index] = pgdbname; if (opts == NULL)
opt_index++; {
fprintf(stderr, _("%s: %s\n"), progname, errmsg);
exit(PQPING_NO_ATTEMPT);
}
} }
/* defs = PQconndefaults();
* Get the default host and port so we can display them in our output if (defs == NULL)
*/
connect_options = PQconndefaults();
conn_opt_ptr = connect_options;
while (conn_opt_ptr->keyword)
{ {
if (strncmp(conn_opt_ptr->keyword, "host", 5) == 0) fprintf(stderr, _("%s: cannot fetch default options\n"), progname);
{ exit(PQPING_NO_ATTEMPT);
if (pghost)
{
keywords[opt_index] = conn_opt_ptr->keyword;
values[opt_index] = pghost;
opt_index++;
} }
else if (conn_opt_ptr->val)
pghost = conn_opt_ptr->val; for (opt = opts, def = defs; def->keyword; def++)
{
if (strcmp(def->keyword, "hostaddr") == 0 ||
strcmp(def->keyword, "host") == 0)
{
if (opt && opt->val)
pghost_str = opt->val;
else if (pghost)
pghost_str = pghost;
else if (def->val)
pghost_str = def->val;
else else
pghost = DEFAULT_PGSOCKET_DIR; pghost_str = DEFAULT_PGSOCKET_DIR;
} }
else if (strncmp(conn_opt_ptr->keyword, "port", 5) == 0) else if (strcmp(def->keyword, "port") == 0)
{ {
if (pgport) if (opt && opt->val)
{ pgport_str = opt->val;
keywords[opt_index] = conn_opt_ptr->keyword; else if (pgport)
values[opt_index] = pgport; pgport_str = pgport;
opt_index++; else if (def->val)
pgport_str = def->val;
} }
else if (conn_opt_ptr->val)
pgport = conn_opt_ptr->val; if (opt)
} opt++;
conn_opt_ptr++;
} }
rv = PQpingParams(keywords, values, 1); rv = PQpingParams(keywords, values, 1);
if (!quiet) if (!quiet)
{ {
printf("%s:%s - ", pghost, pgport); printf("%s:%s - ", pghost_str, pgport_str);
switch (rv) switch (rv)
{ {
@@ -186,8 +200,6 @@ main(int argc, char **argv)
} }
} }
PQconninfoFree(connect_options);
exit(rv); exit(rv);
} }