Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit73e7e49

Browse files
Allow emit_log_hook to see original message text
emit_log_hook could only see the translated text, making it harder to identifywhich message was being sent. Pass original text to allow the exact message tobe identified, whichever language is used for logging.Discussion: 20160216.184755.59721141.horiguchi.kyotaro@lab.ntt.co.jpAuthor: Kyotaro Horiguchi
1 parenta414d96 commit73e7e49

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,7 @@ errmsg(const char *fmt,...)
801801
CHECK_STACK_DEPTH();
802802
oldcontext=MemoryContextSwitchTo(edata->assoc_context);
803803

804+
edata->message_id=fmt;
804805
EVALUATE_MESSAGE(edata->domain,message, false, true);
805806

806807
MemoryContextSwitchTo(oldcontext);
@@ -830,6 +831,7 @@ errmsg_internal(const char *fmt,...)
830831
CHECK_STACK_DEPTH();
831832
oldcontext=MemoryContextSwitchTo(edata->assoc_context);
832833

834+
edata->message_id=fmt;
833835
EVALUATE_MESSAGE(edata->domain,message, false, false);
834836

835837
MemoryContextSwitchTo(oldcontext);
@@ -853,6 +855,7 @@ errmsg_plural(const char *fmt_singular, const char *fmt_plural,
853855
CHECK_STACK_DEPTH();
854856
oldcontext=MemoryContextSwitchTo(edata->assoc_context);
855857

858+
edata->message_id=fmt_singular;
856859
EVALUATE_MESSAGE_PLURAL(edata->domain,message, false);
857860

858861
MemoryContextSwitchTo(oldcontext);
@@ -1361,6 +1364,7 @@ elog_finish(int elevel, const char *fmt,...)
13611364
recursion_depth++;
13621365
oldcontext=MemoryContextSwitchTo(edata->assoc_context);
13631366

1367+
edata->message_id=fmt;
13641368
EVALUATE_MESSAGE(edata->domain,message, false, false);
13651369

13661370
MemoryContextSwitchTo(oldcontext);
@@ -1420,6 +1424,7 @@ format_elog_string(const char *fmt,...)
14201424

14211425
oldcontext=MemoryContextSwitchTo(ErrorContext);
14221426

1427+
edata->message_id=fmt;
14231428
EVALUATE_MESSAGE(edata->domain,message, false, true);
14241429

14251430
MemoryContextSwitchTo(oldcontext);
@@ -1458,6 +1463,11 @@ EmitErrorReport(void)
14581463
* where it would have much less information available. emit_log_hook is
14591464
* intended for custom log filtering and custom log message transmission
14601465
* mechanisms.
1466+
*
1467+
* The log hook has access to both the translated and original English
1468+
* error message text, which is passed through to allow it to be used
1469+
* as a message identifier. Note that the original text is not available
1470+
* for detail, detail_log, hint and context text elements.
14611471
*/
14621472
if (edata->output_to_server&&emit_log_hook)
14631473
(*emit_log_hook) (edata);

‎src/include/utils/elog.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,11 +349,12 @@ typedef struct ErrorData
349349
constchar*domain;/* message domain */
350350
constchar*context_domain;/* message domain for context message */
351351
intsqlerrcode;/* encoded ERRSTATE */
352-
char*message;/* primary error message */
352+
char*message;/* primary error message(translated)*/
353353
char*detail;/* detail error message */
354354
char*detail_log;/* detail error message for server log only */
355355
char*hint;/* hint message */
356356
char*context;/* context message */
357+
constchar*message_id;/* message id of .message (original English text) */
357358
char*schema_name;/* name of schema */
358359
char*table_name;/* name of table */
359360
char*column_name;/* name of column */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp