diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-01-26 15:38:33 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-01-26 15:38:33 -0500 |
| commit | b043df093a356f0a1936999db3dfddade95c6ffb (patch) | |
| tree | cddc5de18ded5b9b334ed6e81a25524782ac0f91 | |
| parent | b1bc381446d7089164b92d52dab1a2d2872dba54 (diff) | |
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.
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 9b830654746..aef07cbe3b3 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]) @@ -3618,12 +3626,6 @@ BackendInitialize(Port *port) } /* - * 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. * |