StreamConnection() mustn't call elog().

tglsfdc · tglsfdc · commit 45500964f61b · 1999-09-08T22:57:12.000Z
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -28,7 +28,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.82 1999/08/31 04:26:37 tgl Exp $
+ *	$Id: pqcomm.c,v 1.83 1999/09/08 22:57:12 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -335,6 +335,10 @@ StreamServerPort(char *hostName, unsigned short portName, int *fdP)
  *		the Postmaster uses select() to tell when the server master
  *		socket is ready for accept().
  *
+ * NB: this can NOT call elog() because it is invoked in the postmaster,
+ * not in standard backend context.  If we get an error, the best we can do
+ * is log it to stderr.
+ *
  * RETURNS: STATUS_OK or STATUS_ERROR
  */
 int
@@ -348,7 +352,7 @@ StreamConnection(int server_fd, Port *port)
 							 (struct sockaddr *) & port->raddr,
 							 &addrlen)) < 0)
 	{
-		elog(ERROR, "postmaster: StreamConnection: accept: %m");
+		perror("postmaster: StreamConnection: accept");
 		return STATUS_ERROR;
 	}
 
@@ -357,7 +361,7 @@ StreamConnection(int server_fd, Port *port)
 	if (getsockname(port->sock, (struct sockaddr *) & port->laddr,
 					&addrlen) < 0)
 	{
-		elog(ERROR, "postmaster: StreamConnection: getsockname: %m");
+		perror("postmaster: StreamConnection: getsockname");
 		return STATUS_ERROR;
 	}
 
@@ -370,13 +374,13 @@ StreamConnection(int server_fd, Port *port)
 		pe = getprotobyname("TCP");
 		if (pe == NULL)
 		{
-			elog(ERROR, "postmaster: getprotobyname failed");
+			perror("postmaster: StreamConnection: getprotobyname");
 			return STATUS_ERROR;
 		}
 		if (setsockopt(port->sock, pe->p_proto, TCP_NODELAY,
 					   &on, sizeof(on)) < 0)
 		{
-			elog(ERROR, "postmaster: setsockopt failed: %m");
+			perror("postmaster: StreamConnection: setsockopt");
 			return STATUS_ERROR;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* Copyright (c) 1994, Regents of the University of California`
`30`	`30`	`*`
`31`		`- * $Id: pqcomm.c,v 1.82 1999/08/31 04:26:37 tgl Exp $`
	`31`	`+ * $Id: pqcomm.c,v 1.83 1999/09/08 22:57:12 tgl Exp $`
`32`	`32`	`*`
`33`	`33`	`*-------------------------------------------------------------------------`
`34`	`34`	`*/`
`@@ -335,6 +335,10 @@ StreamServerPort(char hostName, unsigned short portName, int fdP)`
`335`	`335`	`* the Postmaster uses select() to tell when the server master`
`336`	`336`	`* socket is ready for accept().`
`337`	`337`	`*`
	`338`	`+ * NB: this can NOT call elog() because it is invoked in the postmaster,`
	`339`	`+ * not in standard backend context. If we get an error, the best we can do`
	`340`	`+ * is log it to stderr.`
	`341`	`+ *`
`338`	`342`	`* RETURNS: STATUS_OK or STATUS_ERROR`
`339`	`343`	`*/`
`340`	`344`	`int`
`@@ -348,7 +352,7 @@ StreamConnection(int server_fd, Port *port)`
`348`	`352`	`(struct sockaddr *) & port->raddr,`
`349`	`353`	`&addrlen)) < 0)`
`350`	`354`	`{`
`351`		`- elog(ERROR, "postmaster: StreamConnection: accept: %m");`
	`355`	`+ perror("postmaster: StreamConnection: accept");`
`352`	`356`	`return STATUS_ERROR;`
`353`	`357`	`}`
`354`	`358`
`@@ -357,7 +361,7 @@ StreamConnection(int server_fd, Port *port)`
`357`	`361`	`if (getsockname(port->sock, (struct sockaddr *) & port->laddr,`
`358`	`362`	`&addrlen) < 0)`
`359`	`363`	`{`
`360`		`- elog(ERROR, "postmaster: StreamConnection: getsockname: %m");`
	`364`	`+ perror("postmaster: StreamConnection: getsockname");`
`361`	`365`	`return STATUS_ERROR;`
`362`	`366`	`}`
`363`	`367`
`@@ -370,13 +374,13 @@ StreamConnection(int server_fd, Port *port)`
`370`	`374`	`pe = getprotobyname("TCP");`
`371`	`375`	`if (pe == NULL)`
`372`	`376`	`{`
`373`		`- elog(ERROR, "postmaster: getprotobyname failed");`
	`377`	`+ perror("postmaster: StreamConnection: getprotobyname");`
`374`	`378`	`return STATUS_ERROR;`
`375`	`379`	`}`
`376`	`380`	`if (setsockopt(port->sock, pe->p_proto, TCP_NODELAY,`
`377`	`381`	`&on, sizeof(on)) < 0)`
`378`	`382`	`{`
`379`		`- elog(ERROR, "postmaster: setsockopt failed: %m");`
	`383`	`+ perror("postmaster: StreamConnection: setsockopt");`
`380`	`384`	`return STATUS_ERROR;`
`381`	`385`	`}`
`382`	`386`	`}`