NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit66229ac

committed

Introduce a LOG_SERVER_ONLY ereport level, which is never sent to client.

This elevel is useful for logging audit messages and similar informationthat should not be passed to the client. It's equivalent to LOG in termsof decisions about logging priority in the postmaster log, but messageswith this elevel will never be sent to the client.In the current implementation, it's just an alias for the longstandingCOMMERROR elevel (or more accurately, we've made COMMERROR an alias forthis). At some point it might be interesting to allow a LOG_ONLY flag tobe attached to any elevel, but that would be considerably more complicated,and it's not clear there's enough use-cases to justify the extra work.For now, let's just take the easy 90% solution.David Steele, reviewed by Fabien Coelho, Petr Jelínek, and myself

1 parent58666ed commit66229acCopy full SHA for 66229ac

File tree

2 files changed

+11

-9

lines changed

src
- backend/utils/error
  - elog.c
- include/utils
  - elog.h

2 files changed

+11

-9

lines changed

`‎src/backend/utils/error/elog.c`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ errstart(int elevel, const char *filename, int lineno,`
`293`	`293`	`output_to_server=is_log_level_output(elevel,log_min_messages);`
`294`	`294`
`295`	`295`	`/* Determine whether message is enabled for client output */`
`296`		`-if (whereToSendOutput==DestRemote&&elevel!=COMMERROR)`
	`296`	`+if (whereToSendOutput==DestRemote&&elevel!=LOG_SERVER_ONLY)`
`297`	`297`	`{`
`298`	`298`	`/*`
`299`	`299`	`* client_min_messages is honored only after we complete the`
`@@ -2086,7 +2086,7 @@ write_eventlog(int level, const char *line, int len)`
`2086`	`2086`	`caseDEBUG2:`
`2087`	`2087`	`caseDEBUG1:`
`2088`	`2088`	`caseLOG:`
`2089`		`-caseCOMMERROR:`
	`2089`	`+caseLOG_SERVER_ONLY:`
`2090`	`2090`	`caseINFO:`
`2091`	`2091`	`caseNOTICE:`
`2092`	`2092`	`eventlevel=EVENTLOG_INFORMATION_TYPE;`
`@@ -2965,7 +2965,7 @@ send_message_to_server_log(ErrorData *edata)`
`2965`	`2965`	`syslog_level=LOG_DEBUG;`
`2966`	`2966`	`break;`
`2967`	`2967`	`caseLOG:`
`2968`		`-caseCOMMERROR:`
	`2968`	`+caseLOG_SERVER_ONLY:`
`2969`	`2969`	`caseINFO:`
`2970`	`2970`	`syslog_level=LOG_INFO;`
`2971`	`2971`	`break;`
`@@ -3595,7 +3595,7 @@ error_severity(int elevel)`
`3595`	`3595`	`prefix=_("DEBUG");`
`3596`	`3596`	`break;`
`3597`	`3597`	`caseLOG:`
`3598`		`-caseCOMMERROR:`
	`3598`	`+caseLOG_SERVER_ONLY:`
`3599`	`3599`	`prefix=_("LOG");`
`3600`	`3600`	`break;`
`3601`	`3601`	`caseINFO:`
`@@ -3699,7 +3699,7 @@ write_stderr(const char *fmt,...)`
`3699`	`3699`	`staticbool`
`3700`	`3700`	`is_log_level_output(intelevel,intlog_min_level)`
`3701`	`3701`	`{`
`3702`		`-if (elevel==LOG\|\|elevel==COMMERROR)`
	`3702`	`+if (elevel==LOG\|\|elevel==LOG_SERVER_ONLY)`
`3703`	`3703`	`{`
`3704`	`3704`	`if (log_min_level==LOG\|\|log_min_level <=ERROR)`
`3705`	`3705`	`return true;`

`‎src/include/utils/elog.h`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,11 @@`
`25`	`25`	`#defineDEBUG114/* used by GUC debug_* variables */`
`26`	`26`	`#defineLOG15/* Server operational messages; sent only to`
`27`	`27`	`* server log by default. */`
`28`		`-#defineCOMMERROR16/* Client communication problems; same as LOG`
`29`		`- * for server reporting, but never sent to`
`30`		`- * client. */`
	`28`	`+#defineLOG_SERVER_ONLY 16/* Same as LOG for server reporting, but never`
	`29`	`+ * sent to client. */`
	`30`	`+#defineCOMMERRORLOG_SERVER_ONLY/* Client communication problems; same`
	`31`	`+ * as LOG for server reporting, but`
	`32`	`+ * never sent to client. */`
`31`	`33`	`#defineINFO17/* Messages specifically requested by user (eg`
`32`	`34`	`* VACUUM VERBOSE output); always sent to`
`33`	`35`	`* client regardless of client_min_messages,`
`@@ -354,7 +356,7 @@ typedef struct ErrorData`
`354`	`356`	`chardetail_log;/ detail error message for server log only */`
`355`	`357`	`charhint;/ hint message */`
`356`	`358`	`charcontext;/ context message */`
`357`		`-constcharmessage_id;/ message idof .message(originalEnglish text) */`
	`359`	`+constcharmessage_id;/primarymessage's id (originalstring) */`
`358`	`360`	`charschema_name;/ name of schema */`
`359`	`361`	`chartable_name;/ name of table */`
`360`	`362`	`charcolumn_name;/ name of column */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit66229ac

File tree

2 files changed

2 files changed

`‎src/backend/utils/error/elog.c`

`‎src/include/utils/elog.h`

0 commit comments