From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 12 Aug 2005 21:38:00 +0000 (+0000)
Subject: This patch fixes the event type used to log output from the
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=25a27b69832a02e9de35569b51e11993a67c8055;p=users%2Fbernd%2Fpostgres.git

This patch fixes the event type used to log output from the
stderr-in-service or output-from-syslogger-in-service code. Previously
everything was flagged as ERRORs there, which caused all instances to
log "LOG: logger shutting down" as error...

Please apply for 8.1. I'd also like it considered for 8.0 since logging
non-errors as errors can be cause for alarm amongst people who actually
look at their logs...

Magnus Hagander
---

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 633874a0ed..c1477d49f4 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -1266,6 +1266,7 @@ write_syslog(int level, const char *line)
 static void
 write_eventlog(int level, const char *line)
 {
+	int eventlevel = EVENTLOG_ERROR_TYPE;
 	static HANDLE evtHandle = INVALID_HANDLE_VALUE;
 
 	if (evtHandle == INVALID_HANDLE_VALUE)
@@ -1278,8 +1279,33 @@ write_eventlog(int level, const char *line)
 		}
 	}
 
+	switch (level)
+	{
+		case DEBUG5:
+		case DEBUG4:
+		case DEBUG3:
+		case DEBUG2:
+		case DEBUG1:
+		case LOG:
+		case COMMERROR:
+		case INFO:
+		case NOTICE:
+			eventlevel = EVENTLOG_INFORMATION_TYPE;
+			break;
+		case WARNING:
+			eventlevel = EVENTLOG_WARNING_TYPE;
+			break;
+		case ERROR:
+		case FATAL:
+		case PANIC:
+		default:
+			eventlevel = EVENTLOG_ERROR_TYPE;
+			break;
+	}
+
+
 	ReportEvent(evtHandle,
-				level,
+				eventlevel,
 				0,
 				0,				/* All events are Id 0 */
 				NULL,
@@ -1557,7 +1583,6 @@ send_message_to_server_log(ErrorData *edata)
 		appendStringInfoChar(&buf, '\n');
 	}
 
-
 #ifdef HAVE_SYSLOG
 	/* Write to syslog, if enabled */
 	if (Log_destination & LOG_DESTINATION_SYSLOG)
@@ -1597,40 +1622,32 @@ send_message_to_server_log(ErrorData *edata)
 		write_syslog(syslog_level, buf.data);
 	}
 #endif   /* HAVE_SYSLOG */
+
 #ifdef WIN32
+	/* Write to eventlog, if enabled */
 	if (Log_destination & LOG_DESTINATION_EVENTLOG)
 	{
-		int			eventlog_level;
-
-		switch (edata->elevel)
-		{
-			case DEBUG5:
-			case DEBUG4:
-			case DEBUG3:
-			case DEBUG2:
-			case DEBUG1:
-			case LOG:
-			case COMMERROR:
-			case INFO:
-			case NOTICE:
-				eventlog_level = EVENTLOG_INFORMATION_TYPE;
-				break;
-			case WARNING:
-				eventlog_level = EVENTLOG_WARNING_TYPE;
-				break;
-			case ERROR:
-			case FATAL:
-			case PANIC:
-			default:
-				eventlog_level = EVENTLOG_ERROR_TYPE;
-				break;
-		}
-		write_eventlog(eventlog_level, buf.data);
+		write_eventlog(edata->elevel, buf.data);
 	}
 #endif   /* WIN32 */
+
 	/* Write to stderr, if enabled */
 	if ((Log_destination & LOG_DESTINATION_STDERR) || whereToSendOutput == Debug)
-		fprintf(stderr, "%s", buf.data);
+	{
+#ifdef WIN32
+		/*
+		 * In a win32 service environment, there is no usable stderr. Capture
+		 * anything going there and write it to the eventlog instead.
+		 *
+		 * If stderr redirection is active, it's ok to write to stderr
+		 * because that's really a pipe to the syslogger process.
+		 */
+		if ((!Redirect_stderr || am_syslogger) && pgwin32_is_service())
+			write_eventlog(edata->elevel, buf.data);
+		else
+#endif
+			fprintf(stderr, "%s", buf.data);
+	}
 
 	/* If in the syslogger process, try to write messages direct to file */
 	if (am_syslogger)