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 | b8682a7155bee06667c5773e1ca6499a670338b0 (patch) | |
| tree | 6a14a886ee899fbb21d3d2cde0ca662f3a38c35b | |
| parent | cc988fbb0bf60a83b628b5615e6bade5ae9ae6f4 (diff) | |
| download | postgresql-b8682a7155bee06667c5773e1ca6499a670338b0.tar.gz postgresql-b8682a7155bee06667c5773e1ca6499a670338b0.zip | |
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 27e3745499c..9aaed5b9848 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]) @@ -4082,12 +4090,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. * |