aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-07-18 23:43:32 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2010-07-18 23:43:32 +0000
commitcf5305f4066d827269b27f75af52dc2699d5426f (patch)
treec54dacee895414e91675d3abec695da184347486
parentfba999cb2c8aeafc113b965682bcc9f9ce081c88 (diff)
downloadpostgresql-cf5305f4066d827269b27f75af52dc2699d5426f.tar.gz
postgresql-cf5305f4066d827269b27f75af52dc2699d5426f.zip
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..93f0ba0e392 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.225 2010/07/18 23:43:32 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);
}
}