mirror of
https://github.com/postgres/postgres.git
synced 2025-07-24 14:22:24 +03:00
Add local-address escape "%L" to log_line_prefix.
This escape shows the numeric server IP address that the client has connected to. Unix-socket connections will show "[local]". Non-client processes (e.g. background processes) will show "[none]". We expect that this option will be of interest to only a fairly small number of users. Therefore the implementation is optimized for the case where it's not used (that is, we don't do the string conversion until we have to), and we've not added the field to csvlog or jsonlog formats. Author: Greg Sabino Mullane <htamfids@gmail.com> Reviewed-by: Cary Huang <cary.huang@highgo.ca> Reviewed-by: David Steele <david@pgmasters.net> Reviewed-by: Jim Jones <jim.jones@uni-muenster.de> Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/CAKAnmmK-U+UicE-qbNU23K--Q5XTLdM6bj+gbkZBZkjyjrd3Ow@mail.gmail.com
This commit is contained in:
@ -67,6 +67,7 @@
|
||||
#endif
|
||||
|
||||
#include "access/xact.h"
|
||||
#include "common/ip.h"
|
||||
#include "libpq/libpq.h"
|
||||
#include "libpq/pqformat.h"
|
||||
#include "mb/pg_wchar.h"
|
||||
@ -3084,6 +3085,38 @@ log_status_format(StringInfo buf, const char *format, ErrorData *edata)
|
||||
appendStringInfoSpaces(buf,
|
||||
padding > 0 ? padding : -padding);
|
||||
break;
|
||||
case 'L':
|
||||
{
|
||||
const char *local_host;
|
||||
|
||||
if (MyProcPort)
|
||||
{
|
||||
if (MyProcPort->local_host[0] == '\0')
|
||||
{
|
||||
/*
|
||||
* First time through: cache the lookup, since it
|
||||
* might not have trivial cost.
|
||||
*/
|
||||
(void) pg_getnameinfo_all(&MyProcPort->laddr.addr,
|
||||
MyProcPort->laddr.salen,
|
||||
MyProcPort->local_host,
|
||||
sizeof(MyProcPort->local_host),
|
||||
NULL, 0,
|
||||
NI_NUMERICHOST | NI_NUMERICSERV);
|
||||
}
|
||||
local_host = MyProcPort->local_host;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Background process, or connection not yet made */
|
||||
local_host = "[none]";
|
||||
}
|
||||
if (padding != 0)
|
||||
appendStringInfo(buf, "%*s", padding, local_host);
|
||||
else
|
||||
appendStringInfoString(buf, local_host);
|
||||
}
|
||||
break;
|
||||
case 'r':
|
||||
if (MyProcPort && MyProcPort->remote_host)
|
||||
{
|
||||
|
@ -604,6 +604,7 @@
|
||||
# %d = database name
|
||||
# %r = remote host and port
|
||||
# %h = remote host
|
||||
# %L = local address
|
||||
# %b = backend type
|
||||
# %p = process ID
|
||||
# %P = process ID of parallel group leader
|
||||
|
Reference in New Issue
Block a user