Suppress port number for unix domain sockets in log connect/disconnect

bmomjian · bmomjian · commit a3b9c6988da0 · 2005-09-22T15:33:36.000Z
messages.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.467 2005/08/20 23:26:17 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.468 2005/09/22 15:33:35 momjian Exp $
  *
  * NOTES
  *
@@ -2701,8 +2701,9 @@ BackendRun(Port *port)
 
 	if (Log_connections)
 		ereport(LOG,
-				(errmsg("connection received: host=%s port=%s",
-						remote_host, remote_port)));
+				(errmsg("connection received: host=%s%s%s",
+						remote_host, remote_port[0] ? " port=" : "",
+						remote_port)));
 
 	/*
 	 * save remote_host and remote_port in port stucture
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.460 2005/09/19 17:21:47 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.461 2005/09/22 15:33:36 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -3525,9 +3525,11 @@ log_disconnections(int code, Datum arg)
 	snprintf(dbname, sizeof(dbname), " database=%s", port->database_name);
 	snprintf(remote_host, sizeof(remote_host), " host=%s",
 			 port->remote_host);
-	snprintf(remote_port, sizeof(remote_port), " port=%s", port->remote_port);
-
-
+	if (port->remote_port[0])
+		snprintf(remote_port, sizeof(remote_port), " port=%s", port->remote_port);
+	else
+		remote_port[0] = '\0';
+		
 	gettimeofday(&end, NULL);
 
 	if (end.tv_usec < port->session_start.tv_usec)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.467 2005/08/20 23:26:17 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.468 2005/09/22 15:33:35 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -2701,8 +2701,9 @@ BackendRun(Port *port)`
`2701`	`2701`
`2702`	`2702`	`if (Log_connections)`
`2703`	`2703`	`ereport(LOG,`
`2704`		`- (errmsg("connection received: host=%s port=%s",`
`2705`		`- remote_host, remote_port)));`
	`2704`	`+ (errmsg("connection received: host=%s%s%s",`
	`2705`	`+ remote_host, remote_port[0] ? " port=" : "",`
	`2706`	`+ remote_port)));`
`2706`	`2707`
`2707`	`2708`	`/*`
`2708`	`2709`	`* save remote_host and remote_port in port stucture`