mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Arrange for proper newline termination of syslogger's own messages,

Browse Source 
per Andreas.
This commit is contained in:
Tom Lane 2004-08-06 19:17:31 +00:00
parent 18661f282b
commit 220ec930fc
1 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/backend/postmaster/syslogger.c
View File

@ -18,7 +18,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.3 2004/08/06 16:06:59 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.4 2004/08/06 19:17:31 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -102,6 +102,7 @@ static volatile sig_atomic_t got_SIGHUP = false;
static pid_t syslogger_forkexec(void); static pid_t syslogger_forkexec(void);
static void syslogger_parseArgs(int argc, char *argv[]); static void syslogger_parseArgs(int argc, char *argv[]);
#endif #endif
static void write_syslogger_file_binary(const char *buffer, int count);
#ifdef WIN32 #ifdef WIN32
static unsigned int __stdcall pipeThread(void *arg); static unsigned int __stdcall pipeThread(void *arg);
#endif #endif
@ -309,7 +310,7 @@ SysLoggerMain(int argc, char *argv[])
} }
else if (bytesRead > 0) else if (bytesRead > 0)
{ {
write_syslogger_file(logbuffer, bytesRead); write_syslogger_file_binary(logbuffer, bytesRead);
continue; continue;
} }
else else
@ -494,13 +495,16 @@ SysLogger_Start(void)
close(syslogPipe[1]); close(syslogPipe[1]);
syslogPipe[1] = -1; syslogPipe[1] = -1;
#else #else
int fd;
fflush(stderr); fflush(stderr);
if (dup2(_open_osfhandle((long)syslogPipe[1], fd = _open_osfhandle((long) syslogPipe[1],
_O_APPEND | _O_TEXT), _O_APPEND | _O_TEXT);
_fileno(stderr)) < 0) if (dup2(fd, _fileno(stderr)) < 0)
ereport(FATAL, ereport(FATAL,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not redirect stderr: %m"))); errmsg("could not redirect stderr: %m")));
close(fd);
/* Now we are done with the write end of the pipe. */ /* Now we are done with the write end of the pipe. */
CloseHandle(syslogPipe[1]); CloseHandle(syslogPipe[1]);
syslogPipe[1] = 0; syslogPipe[1] = 0;
@ -590,7 +594,7 @@ syslogger_parseArgs(int argc, char *argv[])
if (fd != 0) if (fd != 0)
{ {
fd = _open_osfhandle(fd, _O_APPEND); fd = _open_osfhandle(fd, _O_APPEND);
if (fd != 0) if (fd > 0)
{ {
syslogFile = fdopen(fd, "a"); syslogFile = fdopen(fd, "a");
setvbuf(syslogFile, NULL, LBF_MODE, 0); setvbuf(syslogFile, NULL, LBF_MODE, 0);
@ -609,7 +613,7 @@ syslogger_parseArgs(int argc, char *argv[])
*/ */
/* /*
* Write to the currently open logfile * Write text to the currently open logfile
* *
* This is exported so that elog.c can call it when am_syslogger is true. * This is exported so that elog.c can call it when am_syslogger is true.
* This allows the syslogger process to record elog messages of its own, * This allows the syslogger process to record elog messages of its own,
@ -617,6 +621,48 @@ syslogger_parseArgs(int argc, char *argv[])
*/ */
void void
write_syslogger_file(const char *buffer, int count) write_syslogger_file(const char *buffer, int count)
{
#ifdef WIN32
/*
* On Windows we need to do our own newline-to-CRLF translation.
*/
char convbuf[256];
char *p;
int n;
p = convbuf;
n = 0;
while (count-- > 0)
{
if (*buffer == '\n')
{
*p++ = '\r';
n++;
}
*p++ = *buffer++;
n++;
if (n >= sizeof(convbuf) - 1)
{
write_syslogger_file_binary(convbuf, n);
p = convbuf;
n = 0;
}
}
if (n > 0)
write_syslogger_file_binary(convbuf, n);
#else /* !WIN32 */
write_syslogger_file_binary(buffer, count);
#endif
}
/*
* Write binary data to the currently open logfile
*
* On Windows the data arriving in the pipe already has CR/LF newlines,
* so we must send it to the file without further translation.
*/
static void
write_syslogger_file_binary(const char *buffer, int count)
{ {
int rc; int rc;
@ -664,7 +710,7 @@ pipeThread(void *arg)
errmsg("could not read from logger pipe: %m"))); errmsg("could not read from logger pipe: %m")));
} }
else if (bytesRead > 0) else if (bytesRead > 0)
write_syslogger_file(logbuffer, bytesRead); write_syslogger_file_binary(logbuffer, bytesRead);
} }
/* We exit the above loop only upon detecting pipe EOF */ /* We exit the above loop only upon detecting pipe EOF */