1313 *
1414 *Copyright (c) 2001-2004, PostgreSQL Global Development Group
1515 *
16- *$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.85 2004/11/17 00:14:12 tgl Exp $
16+ *$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.86 2004/12/20 19:17:56 tgl Exp $
1717 * ----------
1818 */
1919#include "postgres.h"
@@ -379,7 +379,7 @@ pgstat_init(void)
379379 * errno will not be set meaningfully here, so don't use it.
380380 */
381381ereport (LOG ,
382- (ERRCODE_CONNECTION_FAILURE ,
382+ (errcode ( ERRCODE_CONNECTION_FAILURE ) ,
383383errmsg ("test message did not get through on socket for statistics collector" )));
384384closesocket (pgStatSock );
385385pgStatSock = -1 ;
@@ -401,7 +401,7 @@ pgstat_init(void)
401401if (test_byte != TESTBYTEVAL )/* strictly paranoia ... */
402402{
403403ereport (LOG ,
404- (ERRCODE_INTERNAL_ERROR ,
404+ (errcode ( ERRCODE_INTERNAL_ERROR ) ,
405405errmsg ("incorrect test message transmission on socket for statistics collector" )));
406406closesocket (pgStatSock );
407407pgStatSock = -1 ;
@@ -414,12 +414,7 @@ pgstat_init(void)
414414
415415/* Did we find a working address? */
416416if (!addr || pgStatSock < 0 )
417- {
418- ereport (LOG ,
419- (errcode_for_socket_access (),
420- errmsg ("disabling statistics collector for lack of working socket" )));
421417gotostartup_failed ;
422- }
423418
424419/*
425420 * Set the socket to non-blocking IO. This ensures that if the
@@ -440,6 +435,9 @@ pgstat_init(void)
440435return ;
441436
442437startup_failed :
438+ ereport (LOG ,
439+ (errmsg ("disabling statistics collector for lack of working socket" )));
440+
443441if (addrs )
444442freeaddrinfo_all (hints .ai_family ,addrs );
445443