NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit38f4328

committed

Fix pg_isready to handle -d option properly.

Previously, -d option for pg_isready was broken. When the name of thedatabase was specified by -d option, pg_isready failed with an error.When the conninfo specified by -d option contained the setting of thehost name but not Numeric IP address (i.e., hostaddr), pg_isreadydisplayed wrong connection message. -d option could not handle a validURI prefix at all. This commit fixes these bugs of pg_isready.Backpatch to 9.3, where pg_isready was introduced.Per report from Josh Berkus and Robert Haas.Original patch by Fabrízio de Royes Mello, heavily modified by me.

1 parent04eee1f commit38f4328Copy full SHA for 38f4328

File tree

1 file changed

+16

-4

lines changed

src/bin/scripts
- pg_isready.c

1 file changed

+16

-4

lines changed

`‎src/bin/scripts/pg_isready.c`

Lines changed: 16 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ main(int argc, char **argv)`
`31`	`31`	`constchar*connect_timeout=DEFAULT_CONNECT_TIMEOUT;`
`32`	`32`
`33`	`33`	`constchar*pghost_str=NULL;`
	`34`	`+constchar*pghostaddr_str=NULL;`
`34`	`35`	`constchar*pgport_str=NULL;`
`35`	`36`
`36`	`37`	`#definePARAMS_ARRAY_SIZE7`
`@@ -130,7 +131,10 @@ main(int argc, char **argv)`
`130`	`131`	`/*`
`131`	`132`	`* Get the host and port so we can display them in our output`
`132`	`133`	`*/`
`133`		`-if (pgdbname)`
	`134`	`+if (pgdbname&&`
	`135`	`+(strncmp(pgdbname,"postgresql://",13)==0\|\|`
	`136`	`+strncmp(pgdbname,"postgres://",11)==0\|\|`
	`137`	`+strchr(pgdbname,'=')!=NULL))`
`134`	`138`	`{`
`135`	`139`	`opts=PQconninfoParse(pgdbname,&errmsg);`
`136`	`140`	`if (opts==NULL)`
`@@ -149,8 +153,7 @@ main(int argc, char **argv)`
`149`	`153`
`150`	`154`	`for (opt=opts,def=defs;def->keyword;def++)`
`151`	`155`	`{`
`152`		`-if (strcmp(def->keyword,"hostaddr")==0\|\|`
`153`		`-strcmp(def->keyword,"host")==0)`
	`156`	`+if (strcmp(def->keyword,"host")==0)`
`154`	`157`	`{`
`155`	`158`	`if (opt&&opt->val)`
`156`	`159`	`pghost_str=opt->val;`
`@@ -161,6 +164,13 @@ main(int argc, char **argv)`
`161`	`164`	`else`
`162`	`165`	`pghost_str=DEFAULT_PGSOCKET_DIR;`
`163`	`166`	`}`
	`167`	`+elseif (strcmp(def->keyword,"hostaddr")==0)`
	`168`	`+{`
	`169`	`+if (opt&&opt->val)`
	`170`	`+pghostaddr_str=opt->val;`
	`171`	`+elseif (def->val)`
	`172`	`+pghostaddr_str=def->val;`
	`173`	`+}`
`164`	`174`	`elseif (strcmp(def->keyword,"port")==0)`
`165`	`175`	`{`
`166`	`176`	`if (opt&&opt->val)`
`@@ -179,7 +189,9 @@ main(int argc, char **argv)`
`179`	`189`
`180`	`190`	`if (!quiet)`
`181`	`191`	`{`
`182`		`-printf("%s:%s - ",pghost_str,pgport_str);`
	`192`	`+printf("%s:%s - ",`
	`193`	`+pghostaddr_str!=NULL ?pghostaddr_str :pghost_str,`
	`194`	`+pgport_str);`
`183`	`195`
`184`	`196`	`switch (rv)`
`185`	`197`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit38f4328

File tree

1 file changed

1 file changed

`‎src/bin/scripts/pg_isready.c`

0 commit comments