*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.198 2007/11/15 21:14:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.199 2007/12/11 15:19:05 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
static void append_with_tabs(StringInfo buf, const char *str);
static bool is_log_level_output(int elevel, int log_min_level);
static void write_pipe_chunks(char *data, int len, int dest);
-static void get_csv_error_message(StringInfo buf, ErrorData *edata);
static void write_csvlog(ErrorData *edata);
/*
}
}
-
/*
* append a CSV'd version of a string to a StringInfo
* We use the PostgreSQL defaults for CSV, i.e. quote = escape = '"'
+ * If it's NULL, append nothing.
*/
-
static inline void
appendCSVLiteral(StringInfo buf, const char *data)
{
const char *p = data;
char c;
+ /* avoid confusing an empty string with NULL */
+ if (p == NULL)
+ return;
+
appendStringInfoCharMacro(buf, '"');
while ((c = *p++) != '\0')
{
}
/*
- * Constructs the error message, depending on the Errordata it gets,
- * in CSV (comma separated values) format. The COPY command
- * can then be used to load the messages into a table.
+ * Constructs the error message, depending on the Errordata it gets, in a CSV
+ * format which is described in doc/src/sgml/config.sgml.
*/
static void
write_csvlog(ErrorData *edata)
{
- StringInfoData msgbuf;
StringInfoData buf;
+ bool print_stmt = false;
/* static counter for line numbers */
static long log_line_number = 0;
}
log_line_number++;
- initStringInfo(&msgbuf);
initStringInfo(&buf);
- /*
- * The format of the log output in CSV format: timestamp with
- * milliseconds, username, databasename, session id, host and port number,
- * process id, process line number, command tag, session start time,
- * virtual transaction id, regular transaction id, error severity, sql
- * state code, error message.
- */
-
- /* timestamp_with_milliseconds */
/*
- * Check if the timestamp is already calculated for the syslog message, if
- * it is, then no need to calculate it again, will use the same, else get
- * the current timestamp. This is done to put same timestamp in both
- * syslog and csvlog messages.
+ * timestamp with milliseconds
+ *
+ * Check if the timestamp is already calculated for the syslog message,
+ * and use it if so. Otherwise, get the current timestamp. This is done
+ * to put same timestamp in both syslog and csvlog messages.
*/
if (formatted_log_time[0] == '\0')
{
/* username */
if (MyProcPort)
- {
- const char *username = MyProcPort->user_name;
-
- if (username == NULL || *username == '\0')
- username = _("[unknown]");
-
- appendCSVLiteral(&buf, username);
- }
+ appendCSVLiteral(&buf, MyProcPort->user_name);
appendStringInfoChar(&buf, ',');
- /* databasename */
+ /* database name */
if (MyProcPort)
- {
- const char *dbname = MyProcPort->database_name;
-
- if (dbname == NULL || *dbname == '\0')
- dbname = _("[unknown]");
-
- appendCSVLiteral(&buf, dbname);
- }
+ appendCSVLiteral(&buf, MyProcPort->database_name);
appendStringInfoChar(&buf, ',');
/* session id */
appendStringInfo(&buf, "%lx.%x", (long) MyStartTime, MyProcPid);
appendStringInfoChar(&buf, ',');
- /* Remote host and port (is it safe to not quote this?) */
+ /* Remote host and port */
if (MyProcPort && MyProcPort->remote_host)
{
+ appendStringInfoChar(&buf, '"');
appendStringInfo(&buf, "%s", MyProcPort->remote_host);
if (MyProcPort->remote_port && MyProcPort->remote_port[0] != '\0')
appendStringInfo(&buf, ":%s", MyProcPort->remote_port);
+ appendStringInfoChar(&buf, '"');
}
appendStringInfoChar(&buf, ',');
/* PS display */
if (MyProcPort)
{
+ StringInfoData msgbuf;
const char *psdisp;
int displen;
+ initStringInfo(&msgbuf);
+
psdisp = get_ps_display(&displen);
appendStringInfo(&msgbuf, "%.*s", displen, psdisp);
appendCSVLiteral(&buf, msgbuf.data);
- resetStringInfo(&msgbuf);
+
+ pfree(msgbuf.data);
}
appendStringInfoChar(&buf, ',');
/* Virtual transaction id */
/* keep VXID format in sync with lockfuncs.c */
- if (MyProc != NULL)
+ if (MyProc != NULL && MyProc->backendId != InvalidBackendId)
appendStringInfo(&buf, "%d/%u", MyProc->backendId, MyProc->lxid);
appendStringInfoChar(&buf, ',');
appendStringInfoChar(&buf, ',');
/* Error severity */
- appendStringInfo(&buf, "%s,", error_severity(edata->elevel));
+ appendStringInfo(&buf, "%s", error_severity(edata->elevel));
+ appendStringInfoChar(&buf, ',');
/* SQL state code */
- appendStringInfo(&buf, "%s,", unpack_sql_state(edata->sqlerrcode));
+ appendStringInfo(&buf, "%s", unpack_sql_state(edata->sqlerrcode));
+ appendStringInfoChar(&buf, ',');
- /* Error message and cursor position if any */
- get_csv_error_message(&buf, edata);
+ /* errmessage */
+ appendCSVLiteral(&buf, edata->message);
+ appendStringInfoCharMacro(&buf, ',');
- appendStringInfoChar(&buf, '\n');
+ /* errdetail */
+ appendCSVLiteral(&buf, edata->detail);
+ appendStringInfoCharMacro(&buf, ',');
- /* If in the syslogger process, try to write messages direct to file */
- if (am_syslogger)
- write_syslogger_file(buf.data, buf.len, LOG_DESTINATION_CSVLOG);
- else
- write_pipe_chunks(buf.data, buf.len, LOG_DESTINATION_CSVLOG);
+ /* errhint */
+ appendCSVLiteral(&buf, edata->hint);
+ appendStringInfoCharMacro(&buf, ',');
- pfree(msgbuf.data);
- pfree(buf.data);
-}
+ /* internal query */
+ appendCSVLiteral(&buf, edata->internalquery);
+ appendStringInfoCharMacro(&buf, ',');
-/*
- * Appends the buffer with the error message and the cursor position, all
- * CSV escaped.
- */
-static void
-get_csv_error_message(StringInfo buf, ErrorData *edata)
-{
- char *msg = edata->message ? edata->message : _("missing error text");
- char c;
+ /* if printed internal query, print internal pos too */
+ if (edata->internalpos > 0 && edata->internalquery != NULL)
+ appendStringInfo(&buf, "%d", edata->internalpos);
+ appendStringInfoCharMacro(&buf, ',');
- appendStringInfoCharMacro(buf, '"');
+ /* errcontext */
+ appendCSVLiteral(&buf, edata->context);
+ appendStringInfoCharMacro(&buf, ',');
- while ((c = *msg++) != '\0')
+ /* user query --- only reported if not disabled by the caller */
+ if (is_log_level_output(edata->elevel, log_min_error_statement) &&
+ debug_query_string != NULL &&
+ !edata->hide_stmt)
+ print_stmt = true;
+ if (print_stmt)
+ appendCSVLiteral(&buf, debug_query_string);
+ appendStringInfoCharMacro(&buf, ',');
+ if (print_stmt && edata->cursorpos > 0)
+ appendStringInfo(&buf, "%d", edata->cursorpos);
+ appendStringInfoCharMacro(&buf, ',');
+
+ /* file error location */
+ if (Log_error_verbosity >= PGERROR_VERBOSE)
{
- if (c == '"')
- appendStringInfoCharMacro(buf, '"');
- appendStringInfoCharMacro(buf, c);
+ StringInfoData msgbuf;
+
+ initStringInfo(&msgbuf);
+
+ if (edata->funcname && edata->filename)
+ appendStringInfo(&msgbuf, "%s, %s:%d",
+ edata->funcname, edata->filename,
+ edata->lineno);
+ else if (edata->filename)
+ appendStringInfo(&msgbuf, "%s:%d",
+ edata->filename, edata->lineno);
+ appendCSVLiteral(&buf, msgbuf.data);
+ pfree(msgbuf.data);
}
- if (edata->cursorpos > 0)
- appendStringInfo(buf, _(" at character %d"),
- edata->cursorpos);
- else if (edata->internalpos > 0)
- appendStringInfo(buf, _(" at character %d"),
- edata->internalpos);
+ appendStringInfoChar(&buf, '\n');
- appendStringInfoCharMacro(buf, '"');
+ /* If in the syslogger process, try to write messages direct to file */
+ if (am_syslogger)
+ write_syslogger_file(buf.data, buf.len, LOG_DESTINATION_CSVLOG);
+ else
+ write_pipe_chunks(buf.data, buf.len, LOG_DESTINATION_CSVLOG);
+
+ pfree(buf.data);
}
/*
projects / postgresql / commitdiff