diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/error/elog.c | 10 | ||||
| -rw-r--r-- | src/include/utils/elog.h | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 8e006097a64..740f089ccdb 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -293,7 +293,7 @@ errstart(int elevel, const char *filename, int lineno, output_to_server = is_log_level_output(elevel, log_min_messages); /* Determine whether message is enabled for client output */ - if (whereToSendOutput == DestRemote && elevel != COMMERROR) + if (whereToSendOutput == DestRemote && elevel != LOG_SERVER_ONLY) { /* * client_min_messages is honored only after we complete the @@ -2086,7 +2086,7 @@ write_eventlog(int level, const char *line, int len) case DEBUG2: case DEBUG1: case LOG: - case COMMERROR: + case LOG_SERVER_ONLY: case INFO: case NOTICE: eventlevel = EVENTLOG_INFORMATION_TYPE; @@ -2965,7 +2965,7 @@ send_message_to_server_log(ErrorData *edata) syslog_level = LOG_DEBUG; break; case LOG: - case COMMERROR: + case LOG_SERVER_ONLY: case INFO: syslog_level = LOG_INFO; break; @@ -3595,7 +3595,7 @@ error_severity(int elevel) prefix = _("DEBUG"); break; case LOG: - case COMMERROR: + case LOG_SERVER_ONLY: prefix = _("LOG"); break; case INFO: @@ -3699,7 +3699,7 @@ write_stderr(const char *fmt,...) static bool is_log_level_output(int elevel, int log_min_level) { - if (elevel == LOG || elevel == COMMERROR) + if (elevel == LOG || elevel == LOG_SERVER_ONLY) { if (log_min_level == LOG || log_min_level <= ERROR) return true; diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 901651ff5e9..7471dadd4b6 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -25,9 +25,11 @@ #define DEBUG1 14 /* used by GUC debug_* variables */ #define LOG 15 /* Server operational messages; sent only to * server log by default. */ -#define COMMERROR 16 /* Client communication problems; same as LOG - * for server reporting, but never sent to - * client. */ +#define LOG_SERVER_ONLY 16 /* Same as LOG for server reporting, but never + * sent to client. */ +#define COMMERROR LOG_SERVER_ONLY /* Client communication problems; same + * as LOG for server reporting, but + * never sent to client. */ #define INFO 17 /* Messages specifically requested by user (eg * VACUUM VERBOSE output); always sent to * client regardless of client_min_messages, @@ -354,7 +356,7 @@ typedef struct ErrorData char *detail_log; /* detail error message for server log only */ char *hint; /* hint message */ char *context; /* context message */ - const char *message_id; /* message id of .message (original English text) */ + const char *message_id; /* primary message's id (original string) */ char *schema_name; /* name of schema */ char *table_name; /* name of table */ char *column_name; /* name of column */ |