From b043df093a356f0a1936999db3dfddade95c6ffb Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 26 Jan 2016 15:38:33 -0500 Subject: [PATCH] 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 9b83065474..aef07cbe3b 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -3604,6 +3604,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]) @@ -3617,12 +3625,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. -- 2.40.0