NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb40baa9

committed

Provide log_status_format(), useful for an emit_log_hook.

Refactor so that log_line_prefix() is a thin wrapper over a newfunction log_status_format(), and move the implementation to thelatter. Export log_status_format() so that it can be used by anemit_log_hook.Discussion:https://postgr.es/m/39c8197652f4d3050aedafae79fa5af31096505f.camel%40j-davis.comReviewed-by: Michael Paquier, Alvaro Herrera

1 parentbf022d3 commitb40baa9Copy full SHA for b40baa9

File tree

2 files changed

+16

-3

lines changed

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

2 files changed

+16

-3

lines changed

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

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2438,10 +2438,19 @@ process_log_prefix_padding(const char p, int ppadding)`
`2438`	`2438`	`}`
`2439`	`2439`
`2440`	`2440`	`/*`
`2441`		`- * Formattag info forloglines; append to the provided buffer.`
	`2441`	`+ * Format logstatus information using Log_line_prefix.`
`2442`	`2442`	`*/`
`2443`	`2443`	`staticvoid`
`2444`	`2444`	`log_line_prefix(StringInfobuf,ErrorData*edata)`
	`2445`	`+{`
	`2446`	`+log_status_format(buf,Log_line_prefix,edata);`
	`2447`	`+}`
	`2448`	`+`
	`2449`	`+/*`
	`2450`	`+ * Format log status info; append to the provided buffer.`
	`2451`	`+ */`
	`2452`	`+void`
	`2453`	`+log_status_format(StringInfobuf,constcharformat,ErrorDataedata)`
`2445`	`2454`	`{`
`2446`	`2455`	`/* static counter for line numbers */`
`2447`	`2456`	`staticlonglog_line_number=0;`
`@@ -2465,10 +2474,10 @@ log_line_prefix(StringInfo buf, ErrorData *edata)`
`2465`	`2474`	`}`
`2466`	`2475`	`log_line_number++;`
`2467`	`2476`
`2468`		`-if (Log_line_prefix==NULL)`
	`2477`	`+if (format==NULL)`
`2469`	`2478`	`return;/* in case guc hasn't run yet */`
`2470`	`2479`
`2471`		`-for (p=Log_line_prefix;*p!='\0';p++)`
	`2480`	`+for (p=format;*p!='\0';p++)`
`2472`	`2481`	`{`
`2473`	`2482`	`if (*p!='%')`
`2474`	`2483`	`{`

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

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`#include<setjmp.h>`
`18`	`18`
	`19`	`+#include"lib/stringinfo.h"`
	`20`	`+`
`19`	`21`	`/* Error level codes */`
`20`	`22`	`#defineDEBUG510/* Debugging messages, in categories of`
`21`	`23`	`* decreasing detail. */`
`@@ -439,6 +441,8 @@ extern PGDLLIMPORT bool syslog_split_messages;`
`439`	`441`	`#defineLOG_DESTINATION_JSONLOG16`
`440`	`442`
`441`	`443`	`/* Other exported functions */`
	`444`	`+externvoidlog_status_format(StringInfobuf,constchar*format,`
	`445`	`+ErrorData*edata);`
`442`	`446`	`externvoidDebugFileOpen(void);`
`443`	`447`	`externchar*unpack_sql_state(intsql_state);`
`444`	`448`	`externboolin_error_recursion_trouble(void);`

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!

Commitb40baa9

File tree

2 files changed

2 files changed

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

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

0 commit comments