Check ssl_in_use flag when reporting statistics

mhagander · mhagander · commit 6a5c750f3f72 · 2020-07-07T16:57:27.000+02:00
Previously we checked that the ssl pointer was not null, but this puts a requirement on there being such a pointer which may not be true in future multi-ssl-library supporting times. This seems to have been an oversight in 9029f4b, but hasn't really had any effect since we only have one library. Author: Daniel Gustafsson
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
@@ -2989,7 +2989,7 @@ pgstat_bestart(void)
 		MemSet(&lbeentry.st_clientaddr, 0, sizeof(lbeentry.st_clientaddr));
 
 #ifdef USE_SSL
-	if (MyProcPort && MyProcPort->ssl != NULL)
+	if (MyProcPort && MyProcPort->ssl_in_use)
 	{
 		lbeentry.st_ssl = true;
 		lsslstatus.ssl_bits = be_tls_get_cipher_bits(MyProcPort);

Original file line number	Diff line number	Diff line change
`@@ -2989,7 +2989,7 @@ pgstat_bestart(void)`
`2989`	`2989`	`MemSet(&lbeentry.st_clientaddr, 0, sizeof(lbeentry.st_clientaddr));`
`2990`	`2990`
`2991`	`2991`	`#ifdef USE_SSL`
`2992`		`- if (MyProcPort && MyProcPort->ssl != NULL)`
	`2992`	`+ if (MyProcPort && MyProcPort->ssl_in_use)`
`2993`	`2993`	`{`
`2994`	`2994`	`lbeentry.st_ssl = true;`
`2995`	`2995`	`lsslstatus.ssl_bits = be_tls_get_cipher_bits(MyProcPort);`