Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit cf5305f

Browse files
committed
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.
1 parent fba999c commit cf5305f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/backend/utils/error/elog.c

+5-7
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*
4343
*
4444
* IDENTIFICATION
45-
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.224 2010/05/08 16:39:51 tgl Exp $
45+
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.225 2010/07/18 23:43:32 tgl Exp $
4646
*
4747
*-------------------------------------------------------------------------
4848
*/
@@ -2348,15 +2348,13 @@ send_message_to_server_log(ErrorData *edata)
23482348
}
23492349
else
23502350
{
2351-
const char *msg = _("Not safe to send CSV data\n");
2352-
2353-
write_console(msg, strlen(msg));
2351+
/*
2352+
* syslogger not up (yet), so just dump the message to stderr,
2353+
* unless we already did so above.
2354+
*/
23542355
if (!(Log_destination & LOG_DESTINATION_STDERR) &&
23552356
whereToSendOutput != DestDebug)
2356-
{
2357-
/* write message to stderr unless we just sent it above */
23582357
write_console(buf.data, buf.len);
2359-
}
23602358
pfree(buf.data);
23612359
}
23622360
}

0 commit comments

Comments
 (0)