postgres.git / summary / log / commit / refs

commit    2acb682f68255e9df4f31ff6421d900a467a4675
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Tue Jan 26 20:38:33 2016 +0000
First released in: 9.6.0, 9.1.20, 9.2.15, 9.3.11, 9.4.6, 9.5.1

    Fix startup so that log prefix %h works for the log_connections message.
    
    We entirely randomly chose to initialize port->remote_host just after
    printing the log_connections message, when we could perfectly well do it
    just before, allowing %h and %r to work for that message.  Per gripe from
    Artem Tomyuk.


 src/backend/postmaster/postmaster.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 3cba0e5f50e..7e3fd0d3fde 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -4068,6 +4068,14 @@ BackendInitialize(Port *port)
 	else
 		snprintf(remote_ps_data, sizeof(remote_ps_data), "%s(%s)", remote_host, remote_port);
 
+	/*
+	 * Save remote_host and remote_port in port structure (after this, they
+	 * will appear in log_line_prefix data for log messages).
+	 */
+	port->remote_host = strdup(remote_host);
+	port->remote_port = strdup(remote_port);
+
+	/* And now we can issue the Log_connections message, if wanted */
 	if (Log_connections)
 	{
 		if (remote_port[0])
@@ -4081,12 +4089,6 @@ BackendInitialize(Port *port)
 							remote_host)));
 	}
 
-	/*
-	 * save remote_host and remote_port in port structure
-	 */
-	port->remote_host = strdup(remote_host);
-	port->remote_port = strdup(remote_port);
-
 	/*
 	 * If we did a reverse lookup to name, we might as well save the results
 	 * rather than possibly repeating the lookup during authentication.


[parent: e8267aba5fcf]