Support silent mode for service registrations on win32

mhagander · mhagander · commit 15fe829b23ad · 2011-06-09T18:26:25.000+02:00
Using -s when registering a service will now suppress
the application eventlog entries stating that the service
is starting and started.

MauMau
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -104,6 +104,7 @@ PostgreSQL documentation
    <arg>-D <replaceable>datadir</replaceable></arg>
    <arg>-w</arg>
    <arg>-t <replaceable>seconds</replaceable></arg>
+   <arg>-s</arg>
    <arg>-o <replaceable>options</replaceable></arg>
   </cmdsynopsis>
 
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -155,6 +155,9 @@ write_eventlog(int level, const char *line)
 {
 	static HANDLE evtHandle = INVALID_HANDLE_VALUE;
 
+	if (silent_mode && level == EVENTLOG_INFORMATION_TYPE)
+		return;
+
 	if (evtHandle == INVALID_HANDLE_VALUE)
 	{
 		evtHandle = RegisterEventSource(NULL, "PostgreSQL");
@@ -1131,6 +1134,9 @@ pgwin32_CommandLine(bool registration)
 		/* concatenate */
 		sprintf(cmdLine + strlen(cmdLine), " -t %d", wait_seconds);
 
+	if (registration && silent_mode)
+		strcat(cmdLine, " -s");
+
 	if (post_opts)
 	{
 		strcat(cmdLine, " ");

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,9 @@ write_eventlog(int level, const char *line)`
`155`	`155`	`{`
`156`	`156`	`static HANDLE evtHandle = INVALID_HANDLE_VALUE;`
`157`	`157`
	`158`	`+ if (silent_mode && level == EVENTLOG_INFORMATION_TYPE)`
	`159`	`+ return;`
	`160`	`+`
`158`	`161`	`if (evtHandle == INVALID_HANDLE_VALUE)`
`159`	`162`	`{`
`160`	`163`	`evtHandle = RegisterEventSource(NULL, "PostgreSQL");`
`@@ -1131,6 +1134,9 @@ pgwin32_CommandLine(bool registration)`
`1131`	`1134`	`/* concatenate */`
`1132`	`1135`	`sprintf(cmdLine + strlen(cmdLine), " -t %d", wait_seconds);`
`1133`	`1136`
	`1137`	`+ if (registration && silent_mode)`
	`1138`	`+ strcat(cmdLine, " -s");`
	`1139`	`+`
`1134`	`1140`	`if (post_opts)`
`1135`	`1141`	`{`
`1136`	`1142`	`strcat(cmdLine, " ");`