summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-07-18 23:43:37 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2010-07-18 23:43:37 +0000
commitee9324b68052af3d8fee3774c8d8a4ada5f2e8d2 (patch)
tree5b317210df337b10b017db260e980d4c12fe54cd
parente6dff0a14b495ed3f17d8b66bedf06d7c2e66336 (diff)
Remove unnecessary "Not safe to send CSV data" complaint from elog.c's fallback
path when CSV logging is configured but not yet operational. It's sufficient to send the message to stderr, as we were already doing, and the "Not safe" gripe has already confused at least two core members ... Backpatch to 9.0, but not further --- doesn't seem appropriate to change this behavior in stable branches.
-rw-r--r--src/backend/utils/error/elog.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index b2fab359b87..2cafc31b2cd 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -42,7 +42,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.224 2010/05/08 16:39:51 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.224.2.1 2010/07/18 23:43:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2348,15 +2348,13 @@ send_message_to_server_log(ErrorData *edata)
}
else
{
- const char *msg = _("Not safe to send CSV data\n");
-
- write_console(msg, strlen(msg));
+ /*
+ * syslogger not up (yet), so just dump the message to stderr,
+ * unless we already did so above.
+ */
if (!(Log_destination & LOG_DESTINATION_STDERR) &&
whereToSendOutput != DestDebug)
- {
- /* write message to stderr unless we just sent it above */
write_console(buf.data, buf.len);
- }
pfree(buf.data);
}
}