diff options
| author | Robert Haas <rhaas@postgresql.org> | 2011-01-12 11:59:21 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2011-01-12 11:59:21 -0500 |
| commit | 7a32ff97321408afa0ddfcae1a4a060062956d24 (patch) | |
| tree | 75b47a56036875e9d940ecf0a68a2dcb5f0615b2 | |
| parent | a8a8867912c46a68c9ac14903b3dba2fab8f7097 (diff) | |
| download | postgresql-7a32ff97321408afa0ddfcae1a4a060062956d24.tar.gz postgresql-7a32ff97321408afa0ddfcae1a4a060062956d24.zip | |
Revert patch adding support for logging the current role.
This reverts commit a8a8867912c46a68c9ac14903b3dba2fab8f7097, committed
by me earlier today (2011-01-12). This isn't safe inside an aborted
transaction.
Noted by Tom Lane.
| -rw-r--r-- | doc/src/sgml/config.sgml | 7 | ||||
| -rw-r--r-- | src/backend/utils/error/elog.c | 10 |
2 files changed, 1 insertions, 16 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index d014bb57380..8e2a2c5d736 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -3504,12 +3504,7 @@ local0.* /var/log/postgresql </row> <row> <entry><literal>%u</literal></entry> - <entry>Login user name</entry> - <entry>yes</entry> - </row> - <row> - <entry><literal>%U</literal></entry> - <entry>Current user name</entry> + <entry>User name</entry> <entry>yes</entry> </row> <row> diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 49d9236767d..a1a449f2ddc 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -1826,16 +1826,6 @@ log_line_prefix(StringInfo buf, ErrorData *edata) appendStringInfoString(buf, username); } break; - case 'U': - if (MyProcPort) - { - const char *username = GetUserNameFromId(GetUserId()); - - if (username == NULL || *username == '\0') - username = _("[unknown]"); - appendStringInfoString(buf, username); - } - break; case 'd': if (MyProcPort) { |