Rename show_source_port to log_source_port.

bmomjian · bmomjian · commit aead49667ba2 · 2002-11-15T01:40:20.000Z
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.152 2002/11/15 00:47:22 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.153 2002/11/15 01:40:15 momjian Exp $
 -->
 
 <Chapter Id="runtime">
@@ -1124,7 +1124,7 @@ env PGOPTIONS='-c geqo=off' psql
      </varlistentry>
 
      <varlistentry>
-      <term><varname>SHOW_SOURCE_PORT</varname> (<type>boolean</type>)</term>
+      <term><varname>LOG_SOURCE_PORT</varname> (<type>boolean</type>)</term>
       <listitem>
        <para>
         Shows the outgoing port number of the connecting host in the
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.294 2002/11/14 23:53:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.295 2002/11/15 01:40:18 momjian Exp $
  *
  * NOTES
  *
@@ -200,7 +200,7 @@ int			AuthenticationTimeout = 60;
 int			CheckPointTimeout = 300;
 
 bool		HostnameLookup;		/* for ps display */
-bool		ShowPortNumber;
+bool		LogSourcePort;
 bool		Log_connections = false;
 bool		Db_user_namespace = false;
 
@@ -2119,7 +2119,7 @@ DoBackend(Port *port)
 			elog(LOG, "connection received: host=%s port=%hu",
 				 remote_host, remote_port);
 
-		if (ShowPortNumber)
+		if (LogSourcePort)
 		{
 			/* modify remote_host for use in ps status */
 			int			slen = strlen(remote_host) + 10;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -5,7 +5,7 @@
  * command, configuration file, and command line options.
  * See src/backend/utils/misc/README for more information.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.103 2002/11/15 01:26:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.104 2002/11/15 01:40:19 momjian Exp $
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -480,7 +480,7 @@ static struct config_bool
 		false, NULL, NULL
 	},
 	{
-		{"show_source_port", PGC_SIGHUP}, &ShowPortNumber,
+		{"log_source_port", PGC_SIGHUP}, &LogSourcePort,
 		false, NULL, NULL
 	},
 
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
@@ -35,7 +35,6 @@
 
 #port = 5432 
 #hostname_lookup = false
-#show_source_port = false
 
 #unix_socket_directory = ''
 #unix_socket_group = ''
@@ -122,6 +121,7 @@
 #silent_mode = false
 
 #log_connections = false
+#log_source_port = false
 #log_pid = false
 #log_statement = false
 #log_duration = false
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.51 2002/10/21 18:57:35 petere Exp $
+ * $Id: tcopprot.h,v 1.52 2002/11/15 01:40:20 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -31,7 +31,7 @@ extern bool Warn_restart_ready;
 extern bool InError;
 extern CommandDest whereToSendOutput;
 extern bool HostnameLookup;
-extern bool ShowPortNumber;
+extern bool LogSourcePort;
 extern DLLIMPORT char* debug_query_string;
 
 #ifndef BOOTSTRAP_INCLUDE

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.294 2002/11/14 23:53:27 momjian Exp $`
	`40`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.295 2002/11/15 01:40:18 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -200,7 +200,7 @@ int AuthenticationTimeout = 60;`
`200`	`200`	`int CheckPointTimeout = 300;`
`201`	`201`
`202`	`202`	`bool HostnameLookup; /* for ps display */`
`203`		`-bool ShowPortNumber;`
	`203`	`+bool LogSourcePort;`
`204`	`204`	`bool Log_connections = false;`
`205`	`205`	`bool Db_user_namespace = false;`
`206`	`206`
`@@ -2119,7 +2119,7 @@ DoBackend(Port *port)`
`2119`	`2119`	`elog(LOG, "connection received: host=%s port=%hu",`
`2120`	`2120`	`remote_host, remote_port);`
`2121`	`2121`
`2122`		`- if (ShowPortNumber)`
	`2122`	`+ if (LogSourcePort)`
`2123`	`2123`	`{`
`2124`	`2124`	`/* modify remote_host for use in ps status */`
`2125`	`2125`	`int slen = strlen(remote_host) + 10;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* command, configuration file, and command line options.`
`6`	`6`	`* See src/backend/utils/misc/README for more information.`
`7`	`7`	`*`
`8`		`- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.103 2002/11/15 01:26:09 momjian Exp $`
	`8`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.104 2002/11/15 01:40:19 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`* Copyright 2000 by PostgreSQL Global Development Group`
`11`	`11`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`@@ -480,7 +480,7 @@ static struct config_bool`
`480`	`480`	`false, NULL, NULL`
`481`	`481`	`},`
`482`	`482`	`{`
`483`		`- {"show_source_port", PGC_SIGHUP}, &ShowPortNumber,`
	`483`	`+ {"log_source_port", PGC_SIGHUP}, &LogSourcePort,`
`484`	`484`	`false, NULL, NULL`
`485`	`485`	`},`
`486`	`486`