~ubuntu-branches/ubuntu/hardy/postgresql-8.4/hardy-backports

« back to all changes in this revision

Viewing changes to src/bin/pg_ctl/pg_ctl.c

  • Committer: Package Import Robot
  • Author(s): Ubuntu Archive Auto-Backport
  • Date: 2011-10-27 06:13:09 UTC
  • mfrom: (5.3.14 sid)
  • Revision ID: package-import@ubuntu.com-20111027061309-zc27cjc6hu8yp0z0
Tags: 8.4.9-1~hardy1
Automated backport upload; no source changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
152
152
{
153
153
        static HANDLE evtHandle = INVALID_HANDLE_VALUE;
154
154
 
 
155
        if (silent_mode && level == EVENTLOG_INFORMATION_TYPE)
 
156
                return;
 
157
 
155
158
        if (evtHandle == INVALID_HANDLE_VALUE)
156
159
        {
157
160
                evtHandle = RegisterEventSource(NULL, "PostgreSQL");
1059
1062
                /* concatenate */
1060
1063
                sprintf(cmdLine + strlen(cmdLine), " -t %d", wait_seconds);
1061
1064
 
 
1065
        if (registration && silent_mode)
 
1066
                strcat(cmdLine, " -s");
 
1067
 
1062
1068
        if (post_opts)
1063
1069
        {
1064
1070
                strcat(cmdLine, " ");
1221
1227
                write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Waiting for server startup...\n"));
1222
1228
                if (test_postmaster_connection(true) == false)
1223
1229
                {
1224
 
                        write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Timed out waiting for server startup\n"));
 
1230
                        write_eventlog(EVENTLOG_ERROR_TYPE, _("Timed out waiting for server startup\n"));
1225
1231
                        pgwin32_SetServiceStatus(SERVICE_STOPPED);
1226
1232
                        return;
1227
1233
                }