summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2011-06-09 18:18:45 +0200
committerMagnus Hagander <magnus@hagander.net>2011-06-09 18:28:04 +0200
commit9c04b889966a24c2c021039ba29b30bc7592994c (patch)
tree4950789a09c816c83a6838c34aec645962e9b8a6
parent302e4e6f3b5f5e03162f11c8a074d337cd11acf7 (diff)
Support silent mode for service registrations on win32
Using -s when registering a service will now suppress the application eventlog entries stating that the service is starting and started. MauMau
-rw-r--r--doc/src/sgml/ref/pg_ctl-ref.sgml1
-rw-r--r--src/bin/pg_ctl/pg_ctl.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index c4eae623560..6ee18d406e7 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -91,6 +91,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>
<sbr>
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 92fc1f28302..448bb77be49 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -159,6 +159,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");
@@ -1065,6 +1068,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, " ");