I think this is now ready for application, unless someone objects.

Since the last patch I posted, I have done the following:

. changed the escapes to lower case, as Peter prefers. This is also in 
line with what Apache does, which is the nearest equivalent I can think of.
. added 2 new escapes: %r = remote host and port and %x says "postmaster 
and friends stop here".  Postmaster and friends will also ignore any 
escapes they see that don't make sense (specifically %u %d %i %r %s and 
%c). However, they no longer ignore the whole facility. This means we 
can use it for logging (for example) timestamps and pids in all cases.
. added docco
. changed source port reporting from host:port to host(port) to avoid 
IP6 address ambiguity.

If someone wants to monkey with the name of the facility, it shouldn't 
be hard. I don't like plain "log_line", though. "log_line_prefix" or 
"log_line_tag" both seem to me better alternatives.

After this is applied (fingers crossed) and everyone is happy, I will 
submit a patch to remove log_timestamp, log_pid and (if we are agreed on 
it) log_source_port.

cheers

andrew
Sun, 29 Feb 2004 13:09:45 -0500
Andrew Dunstan <andrew@dunslane.net>
log_line_info
On Sun, 29 Feb 2004, Andrew Dunstan wrote:

> . changed source port reporting from host:port to host(port) to avoid 
> IP6 address ambiguity.

I have no idea how widespread this is, but recent versions of BIND write 
it this way:

127.0.0.1#953
::1#953

Personally I'd kind of like to see host:port for IPv4 (for familiarity)  
and host#port for IPv6 (for clarity), but I don't know that it's worth 
spending much time on.

Excellent patch, though.

Jon

Mon, 1 Mar 2004 21:38:37 +0000 (UTC)
Jon Jensen <jon@endpoint.com>
Re: log_line_info


Jon Jensen wrote:

>On Sun, 29 Feb 2004, Andrew Dunstan wrote:
>
>  
>
>>. changed source port reporting from host:port to host(port) to avoid 
>>IP6 address ambiguity.
>>    
>>
>
>I have no idea how widespread this is, but recent versions of BIND write 
>it this way:
>
>127.0.0.1#953
>::1#953
>
>Personally I'd kind of like to see host:port for IPv4 (for familiarity)  
>and host#port for IPv6 (for clarity), but I don't know that it's worth 
>spending much time on.
>


host might be a name instead of an address (if you have log_host_name 
turned on), so I'm not inclined to distinguish between address families. 
Altering the format used would be a 2 line change. (I hope the patch 
isn't held up over that issue).


>
>Excellent patch, though.
>


thanks

cheers

andrew



Mon, 01 Mar 2004 20:32:43 -0500
Andrew Dunstan <andrew@dunslane.net>
Re: log_line_info
Andrew Dunstan wrote:
> 
> I think this is now ready for application, unless someone objects.
> 
> Since the last patch I posted, I have done the following:
> 
> . changed the escapes to lower case, as Peter prefers. This is also in 
> line with what Apache does, which is the nearest equivalent I can think of.
> . added 2 new escapes: %r = remote host and port and %x says "postmaster 
> and friends stop here".  Postmaster and friends will also ignore any 
> escapes they see that don't make sense (specifically %u %d %i %r %s and 
> %c). However, they no longer ignore the whole facility. This means we 
> can use it for logging (for example) timestamps and pids in all cases.
> . added docco
> . changed source port reporting from host:port to host(port) to avoid 
> IP6 address ambiguity.
> 
> If someone wants to monkey with the name of the facility, it shouldn't 
> be hard. I don't like plain "log_line", though. "log_line_prefix" or 
> "log_line_tag" both seem to me better alternatives.
> 
> After this is applied (fingers crossed) and everyone is happy, I will 
> submit a patch to remove log_timestamp, log_pid and (if we are agreed on 
> it) log_source_port.

I have applied this patch.  It will be a great addition to PostgreSQL.

I made a few modifications.  I reordered the options in the docs and
postgresql.conf, e.g.:
	
	+ #log_line_prefix = ''         # e.g. '<%u%%%d> '
	+                               # %u=user name %d=database name
	+                               # %r=remote host and port
	+                               # %p=PID %t=timestamp %i=command tag
	+                               # %c=session id %l=session line number
	+                               # %s=session start timestamp
	+                               # %x=stop here in non-session processes
	+                               # %%='%'

I also changed:
	
	*** src/include/miscadmin.h     10 Feb 2004 03:42:45 -0000      1.153
	--- src/include/miscadmin.h     29 Feb 2004 17:49:07 -0000
	***************
	*** 24,29 ****
	--- 24,31 ----
	  #define MISCADMIN_H
	
	
	+ #include "libpq/libpq-be.h"

(wouldn't compile) to:
	
	*** src/backend/utils/misc/ps_status.c  22 Feb 2004 21:26:55 -0000     
	1.17
	--- src/backend/utils/misc/ps_status.c  9 Mar 2004 04:33:35 -0000
	***************
	*** 26,31 ****
	--- 26,32 ----
	  #include <crt_externs.h>
	  #endif
	
	+ #include "libpq/libpq.h"
	  #include "miscadmin.h"
	  #include "utils/ps_status.h"
	
for use of "Port".

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

Index: doc/src/sgml/runtime.sgml
===================================================================
RCS file: /cvsroot/pgsql-server/doc/src/sgml/runtime.sgml,v
retrieving revision 1.245
diff -c -c -r1.245 runtime.sgml
*** doc/src/sgml/runtime.sgml	7 Mar 2004 01:02:55 -0000	1.245
--- doc/src/sgml/runtime.sgml	9 Mar 2004 04:33:24 -0000
***************
*** 1973,1978 ****
--- 1973,2070 ----
       </varlistentry>
       
       <varlistentry>
+       <term><varname>log_line_prefix</varname> (<type>string</type>)</term>
+       <listitem>
+        <para>
+ 	 This is a <literal>printf</>-style string that is output at the
+ 	 beginning of each log line. The default is an empty string.
+ 	 Each recognized escape is replaced as outlined 
+ 	 below - anything else that looks like an escape is ignored. Other
+ 	 characters are copied straight to the log line. Some escapes are
+ 	 only recognised by session processes, and do not apply to
+ 	 processes without controlling sessions. <application>Syslog</> produces its own
+ 	 timestamp and process ID information, so you probably do not want to
+ 	 use those escapes if you are using <application>syslog</>.
+ 	 <informaltable>
+ 	  <tgroup cols="3">
+ 	   <thead>
+ 	    <row>
+ 	     <entry>Escape</entry>
+ 	     <entry>Effect</entry>
+ 	     <entry>Session only</entry>
+ 	     </row>
+ 	    </thead>
+ 	   <tbody>
+ 	    <row>
+ 	     <entry><literal>%u</literal></entry>
+ 	     <entry>User Name</entry>
+ 	     <entry>Yes</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%d</literal></entry>
+ 	     <entry>Database Name</entry>
+ 	     <entry>Yes</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%r</literal></entry>
+ 	     <entry>Remote Hostname or IP address, and Remote Port</entry>
+ 	     <entry>Yes</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%p</literal></entry>
+ 	     <entry>Process ID</entry>
+ 	     <entry>No</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%t</literal></entry>
+ 	     <entry>Timestamp</entry>
+ 	     <entry>No</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%i</literal></entry>
+ 	     <entry>Command Tag. This is the command which generated the log
+ 	      line.</entry>
+ 	     <entry>Yes</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%c</literal></entry>
+ 	     <entry>Session ID. A unique identifier for each session.
+ 	     It is 2 4-byte hexadecimal numbers separated by a dot. The numbers
+ 	     are the Session Start Time and the Process ID, so this can also
+ 	     be used as a space saving way of printing these items.</entry>
+ 	     <entry>Yes</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%l</literal></entry>
+ 	     <entry>Number of the log line for each process, 
+ 	      starting at 1</entry>
+ 	     <entry>No</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%s</literal></entry>
+ 	     <entry>Session Start Timestamp</entry>
+ 	     <entry>Yes</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%x</literal></entry>
+ 	     <entry>Does not produce any output, but tells non-session
+ 	     processes to stop at this point in the string. Ignored by
+ 	     session backends.</entry>
+ 	     <entry>No</entry>
+ 	    </row>
+ 	    <row>
+ 	     <entry><literal>%%</literal></entry>
+ 	     <entry>literal <literal>%</></entry>
+ 	     <entry>No</entry>
+ 	    </row>
+ 	   </tbody>
+ 	  </tgroup>
+ 	 </informaltable>
+        </para>
+       </listitem>
+      </varlistentry>
+ 
+      <varlistentry>
        <term><varname>log_pid</varname> (<type>boolean</type>)</term>
        <listitem>
         <para>
Index: src/backend/postmaster/postmaster.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/postmaster/postmaster.c,v
retrieving revision 1.370
diff -c -c -r1.370 postmaster.c
*** src/backend/postmaster/postmaster.c	5 Mar 2004 01:11:04 -0000	1.370
--- src/backend/postmaster/postmaster.c	9 Mar 2004 04:33:28 -0000
***************
*** 2437,2442 ****
--- 2437,2443 ----
  	/* set these to empty in case they are needed before we set them up */
  	port->remote_host = "";
  	port->remote_port = "";
+ 	port->commandTag = "";
  
  	/* Save port etc. for ps status */
  	MyProcPort = port;
***************
*** 2489,2495 ****
  		/* modify remote_host for use in ps status */
  		char		tmphost[NI_MAXHOST];
  
! 		snprintf(tmphost, sizeof(tmphost), "%s:%s", remote_host, remote_port);
  		StrNCpy(remote_host, tmphost, sizeof(remote_host));
  	}
  
--- 2490,2496 ----
  		/* modify remote_host for use in ps status */
  		char		tmphost[NI_MAXHOST];
  
! 		snprintf(tmphost, sizeof(tmphost), "%s(%s)", remote_host, remote_port);
  		StrNCpy(remote_host, tmphost, sizeof(remote_host));
  	}
  
Index: src/backend/tcop/postgres.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/tcop/postgres.c,v
retrieving revision 1.393
diff -c -c -r1.393 postgres.c
*** src/backend/tcop/postgres.c	21 Feb 2004 06:29:58 -0000	1.393
--- src/backend/tcop/postgres.c	9 Mar 2004 04:33:30 -0000
***************
*** 3198,3204 ****
  static void 
  log_disconnections(int code, Datum arg)
  {
! 	Port * port = MyProcPort;
  	struct timeval end;
  	int  hours, minutes, seconds;
  
--- 3198,3204 ----
  static void 
  log_disconnections(int code, Datum arg)
  {
! 	Port *port = MyProcPort;
  	struct timeval end;
  	int  hours, minutes, seconds;
  
Index: src/backend/utils/error/elog.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/error/elog.c,v
retrieving revision 1.126
diff -c -c -r1.126 elog.c
*** src/backend/utils/error/elog.c	29 Nov 2003 19:52:01 -0000	1.126
--- src/backend/utils/error/elog.c	9 Mar 2004 04:33:31 -0000
***************
*** 72,77 ****
--- 72,78 ----
  bool		Log_timestamp = false;		/* show timestamps in stderr
  										 * output */
  bool		Log_pid = false;	/* show PIDs in stderr output */
+ char       *Log_line_prefix = ""; /* format for extra log line info */
  
  #ifdef HAVE_SYSLOG
  /*
***************
*** 146,152 ****
  static const char *print_timestamp(void);
  static const char *print_pid(void);
  static void append_with_tabs(StringInfo buf, const char *str);
! 
  
  /*
   * errstart --- begin an error-reporting cycle
--- 147,153 ----
  static const char *print_timestamp(void);
  static const char *print_pid(void);
  static void append_with_tabs(StringInfo buf, const char *str);
! static const char *log_line_prefix(void);
  
  /*
   * errstart --- begin an error-reporting cycle
***************
*** 1022,1027 ****
--- 1023,1160 ----
  }
  #endif   /* HAVE_SYSLOG */
  
+ /*
+  * Format tag info for log lines 
+  */
+ static const char * 
+ log_line_prefix(void)
+ {
+ 
+ 	/* static accumulator for line numbers */
+ 	static int log_line_number = 0;
+  
+ 	/* space for option string + one of each option, plus some room to spare */
+ 	/* Note: if more identifiers are built in this will have to increase */
+ 	static char *result = NULL;
+ 	int format_len = strlen(Log_line_prefix);
+ 	int result_len = 2*NAMEDATALEN + format_len +120 ;
+ 
+ 	if (result == NULL)
+ 		result = malloc(result_len);
+ 	result[0] = '\0';
+ 
+ 	if (format_len > 0)
+ 	{
+ 		int i,j;
+ 		char * dbname = NULL;
+ 		char * username = NULL;
+ 		time_t stamp_time;
+ 		log_line_number++;
+ 		if (MyProcPort != NULL)
+ 		{
+ 			dbname  = MyProcPort->database_name;
+ 			username = MyProcPort->user_name;
+ 			if (dbname == NULL || *dbname == '\0')
+ 				dbname = gettext("[unknown]");
+ 			if (username == NULL || *username == '\0')
+ 				username = gettext("[unknown]");
+ 		}
+ 
+ 		/*
+ 		 * invariant through each iteration of this loop:
+ 		 *  . j is the index of the trailing null on result
+ 		 *  . result_len - j is the number of chars we have room for
+ 		 *    including the trailing null
+ 		 *  . there is room to write at least one more non-null char plus the
+ 		 *    trailing null
+ 		 */
+ 		for (i = 0, j=0; i < format_len && j < result_len-1; i++)
+ 		{
+ 			if(Log_line_prefix[i] != '%')
+ 			{
+ 				/* literal char, just copy */
+ 				result[j]=Log_line_prefix[i];
+ 				j++;
+ 				result[j] = '\0';
+ 				continue;
+ 			}
+ 			else if (i == format_len - 1)
+ 			{
+ 				/* format error - skip it */
+ 				continue;
+ 			}
+ 
+ 			/* go to char after '%' */
+ 			i++;
+ 
+ 			/* in postmaster and friends, skip non-applicable options,
+ 			 * stop if %x is seen
+ 			 */
+ 			if (MyProcPort == NULL)
+ 			{
+ 				if (Log_line_prefix[i] == 'x')
+ 					break;
+ 				if (strchr("udcsir",Log_line_prefix[i]) != NULL)
+ 					continue;
+ 			}
+ 
+ 			/* process the option */
+ 			switch (Log_line_prefix[i])
+ 			{
+ 				case 'u': 
+ 					j += snprintf(result+j,result_len-j,"%s",username);
+ 					break;
+ 				case 'd': 
+ 					j += snprintf(result+j,result_len-j,"%s",dbname);
+ 					break;
+ 				case 'c':
+ 					j += snprintf(result+j,result_len-j,"%lx.%lx",
+ 								  (long)(MyProcPort->session_start.tv_sec),
+ 								  (long)MyProcPid);
+ 					break;
+ 				case 'p':
+ 					j += snprintf(result+j,result_len-j,"%ld",(long)MyProcPid);
+ 					break;
+ 				case 'l':
+ 					j += snprintf(result+j,result_len-j,"%d",log_line_number);
+ 					break;
+ 				case 't':
+ 					stamp_time = time(NULL);
+ 					j += strftime(result+j, result_len-j, "%Y-%m-%d %H:%M:%S",
+ 							 localtime(&stamp_time));
+ 					break;
+ 				case 's':
+ 					j += strftime(result+j, result_len-j, "%Y-%m-%d %H:%M:%S",
+ 							 localtime(&(MyProcPort->session_start.tv_sec)));
+ 					break;
+ 				case 'i':
+ 					j += snprintf(result+j,result_len-j,"%s",
+ 								  MyProcPort->commandTag);
+ 					break;
+ 				case 'r':
+ 					j += snprintf(result+j,result_len-j,"%s",
+ 								  MyProcPort->remote_host);
+ 					if (!LogSourcePort && strlen(MyProcPort->remote_port))
+ 						j += snprintf(result+j,result_len-j,"(%s)",
+ 									  MyProcPort->remote_port);
+ 					break;
+ 				case 'x': 
+ 					/* non-postmaster case - just ignore */
+ 					break;
+ 				case '%': 
+ 					result[j] = '%';
+ 					j++;
+ 					result[j] = '\0';
+ 					break;
+ 				default:
+ 					/* format error - skip it */
+ 					break;
+ 			}
+ 		}
+ 	}
+ 	return result;
+ }
+ 
  
  /*
   * Write error report to server's log
***************
*** 1033,1039 ****
  
  	initStringInfo(&buf);
  
! 	appendStringInfo(&buf, "%s:  ", error_severity(edata->elevel));
  
  	if (Log_error_verbosity >= PGERROR_VERBOSE)
  	{
--- 1166,1173 ----
  
  	initStringInfo(&buf);
  
! 	appendStringInfo(&buf, "%s%s:  ", 
! 					 log_line_prefix(), error_severity(edata->elevel));
  
  	if (Log_error_verbosity >= PGERROR_VERBOSE)
  	{
***************
*** 1066,1083 ****
--- 1200,1220 ----
  	{
  		if (edata->detail)
  		{
+ 			appendStringInfoString(&buf, log_line_prefix() );
  			appendStringInfoString(&buf, gettext("DETAIL:  "));
  			append_with_tabs(&buf, edata->detail);
  			appendStringInfoChar(&buf, '\n');
  		}
  		if (edata->hint)
  		{
+ 			appendStringInfoString(&buf, log_line_prefix() );
  			appendStringInfoString(&buf, gettext("HINT:  "));
  			append_with_tabs(&buf, edata->hint);
  			appendStringInfoChar(&buf, '\n');
  		}
  		if (edata->context)
  		{
+ 			appendStringInfoString(&buf, log_line_prefix() );
  			appendStringInfoString(&buf, gettext("CONTEXT:  "));
  			append_with_tabs(&buf, edata->context);
  			appendStringInfoChar(&buf, '\n');
***************
*** 1086,1096 ****
  		{
  			/* assume no newlines in funcname or filename... */
  			if (edata->funcname && edata->filename)
! 				appendStringInfo(&buf, gettext("LOCATION:  %s, %s:%d\n"),
  								 edata->funcname, edata->filename,
  								 edata->lineno);
  			else if (edata->filename)
! 				appendStringInfo(&buf, gettext("LOCATION:  %s:%d\n"),
  								 edata->filename, edata->lineno);
  		}
  	}
--- 1223,1235 ----
  		{
  			/* assume no newlines in funcname or filename... */
  			if (edata->funcname && edata->filename)
! 				appendStringInfo(&buf, gettext("%sLOCATION:  %s, %s:%d\n"),
! 								 log_line_prefix(),
  								 edata->funcname, edata->filename,
  								 edata->lineno);
  			else if (edata->filename)
! 				appendStringInfo(&buf, gettext("%sLOCATION:  %s:%d\n"),
! 								 log_line_prefix(),
  								 edata->filename, edata->lineno);
  		}
  	}
***************
*** 1100,1105 ****
--- 1239,1245 ----
  	 */
  	if (edata->elevel >= log_min_error_statement && debug_query_string != NULL)
  	{
+ 		appendStringInfoString(&buf, log_line_prefix() );
  		appendStringInfoString(&buf, gettext("STATEMENT:  "));
  		append_with_tabs(&buf, debug_query_string);
  		appendStringInfoChar(&buf, '\n');
Index: src/backend/utils/misc/guc.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/misc/guc.c,v
retrieving revision 1.188
diff -c -c -r1.188 guc.c
*** src/backend/utils/misc/guc.c	23 Feb 2004 20:45:59 -0000	1.188
--- src/backend/utils/misc/guc.c	9 Mar 2004 04:33:35 -0000
***************
*** 1496,1501 ****
--- 1496,1511 ----
  	},
  
  	{
+ 		{"log_line_prefix", PGC_SIGHUP, LOGGING_WHAT,
+ 		 gettext_noop("Controls information prefixed to each log line"),
+ 		 gettext_noop("if blank no prefix is used")
+ 		},
+ 		&Log_line_prefix,
+ 		"", NULL, NULL
+ 	},
+ 
+ 
+ 	{
  		{"DateStyle", PGC_USERSET, CLIENT_CONN_LOCALE,
  			gettext_noop("Sets the display format for date and time values."),
  			gettext_noop("Also controls interpretation of ambiguous "
Index: src/backend/utils/misc/postgresql.conf.sample
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v
retrieving revision 1.106
diff -c -c -r1.106 postgresql.conf.sample
*** src/backend/utils/misc/postgresql.conf.sample	17 Feb 2004 03:54:57 -0000	1.106
--- src/backend/utils/misc/postgresql.conf.sample	9 Mar 2004 04:33:35 -0000
***************
*** 185,190 ****
--- 185,198 ----
  #log_disconnections = false
  #log_duration = false
  #log_pid = false
+ #log_line_prefix = ''		# e.g. '<%u%%%d> ' 
+ 				# %u=user name %d=database name
+ 				# %r=remote host and port
+ 				# %p=PID %t=timestamp %i=command tag
+ 				# %c=session id %l=session line number
+ 				# %s=session start timestamp
+ 				# %x=stop here in non-session processes
+ 				# %%='%'
  #log_statement = false
  #log_timestamp = false
  #log_hostname = false
Index: src/backend/utils/misc/ps_status.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/misc/ps_status.c,v
retrieving revision 1.17
diff -c -c -r1.17 ps_status.c
*** src/backend/utils/misc/ps_status.c	22 Feb 2004 21:26:55 -0000	1.17
--- src/backend/utils/misc/ps_status.c	9 Mar 2004 04:33:35 -0000
***************
*** 26,31 ****
--- 26,32 ----
  #include <crt_externs.h>
  #endif
  
+ #include "libpq/libpq.h"
  #include "miscadmin.h"
  #include "utils/ps_status.h"
  
***************
*** 276,285 ****
  void
  set_ps_display(const char *activity)
  {
- #ifndef PS_USE_NONE
  	/* no ps display for stand-alone backend */
  	if (!IsUnderPostmaster)
  		return;
  
  #ifdef PS_USE_CLOBBER_ARGV
  	/* If ps_buffer is a pointer, it might still be null */
--- 277,291 ----
  void
  set_ps_display(const char *activity)
  {
  	/* no ps display for stand-alone backend */
  	if (!IsUnderPostmaster)
  		return;
+ 
+ 	/* save it for logging context */
+ 	if (MyProcPort)
+ 		MyProcPort->commandTag = (char *) activity;
+ 
+ #ifndef PS_USE_NONE
  
  #ifdef PS_USE_CLOBBER_ARGV
  	/* If ps_buffer is a pointer, it might still be null */
Index: src/include/libpq/libpq-be.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/libpq/libpq-be.h,v
retrieving revision 1.41
diff -c -c -r1.41 libpq-be.h
*** src/include/libpq/libpq-be.h	21 Feb 2004 06:29:58 -0000	1.41
--- src/include/libpq/libpq-be.h	9 Mar 2004 04:33:36 -0000
***************
*** 50,55 ****
--- 50,56 ----
  	SockAddr	raddr;			/* remote addr (client) */
  	char        *remote_host;   /* name (or ip addr) of remote host */
  	char        *remote_port;   /* text rep of remote port */
+ 	char        *commandTag;    /* command tag for display in log lines */
  	struct timeval  session_start;  /* for session duration logging */
  	CAC_state	canAcceptConnections;	/* postmaster connection status */
  
Index: src/include/utils/elog.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/utils/elog.h,v
retrieving revision 1.64
diff -c -c -r1.64 elog.h
*** src/include/utils/elog.h	29 Nov 2003 22:41:15 -0000	1.64
--- src/include/utils/elog.h	9 Mar 2004 04:33:36 -0000
***************
*** 171,176 ****
--- 171,177 ----
  extern PGErrorVerbosity Log_error_verbosity;
  extern bool Log_timestamp;
  extern bool Log_pid;
+ extern char *Log_line_prefix;
  
  #ifdef HAVE_SYSLOG
  extern int	Use_syslog;
Mon, 8 Mar 2004 23:40:39 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: log_line_info

Oh, I also renamed it to "log_line_prefix", which was one of your
suggestions.  And I also updated some of the documentation phrasing.

I also marked the TODO item as completed.

Thanks.

---------------------------------------------------------------------------

Andrew Dunstan wrote:
> 
> I think this is now ready for application, unless someone objects.
> 
> Since the last patch I posted, I have done the following:
> 
> . changed the escapes to lower case, as Peter prefers. This is also in 
> line with what Apache does, which is the nearest equivalent I can think of.
> . added 2 new escapes: %r = remote host and port and %x says "postmaster 
> and friends stop here".  Postmaster and friends will also ignore any 
> escapes they see that don't make sense (specifically %u %d %i %r %s and 
> %c). However, they no longer ignore the whole facility. This means we 
> can use it for logging (for example) timestamps and pids in all cases.
> . added docco
> . changed source port reporting from host:port to host(port) to avoid 
> IP6 address ambiguity.
> 
> If someone wants to monkey with the name of the facility, it shouldn't 
> be hard. I don't like plain "log_line", though. "log_line_prefix" or 
> "log_line_tag" both seem to me better alternatives.
> 
> After this is applied (fingers crossed) and everyone is happy, I will 
> submit a patch to remove log_timestamp, log_pid and (if we are agreed on 
> it) log_source_port.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

Mon, 8 Mar 2004 23:46:05 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: log_line_info
Bruce Momjian wrote:

>Andrew Dunstan wrote:
>  
>
>>After this is applied (fingers crossed) and everyone is happy, I will 
>>submit a patch to remove log_timestamp, log_pid and (if we are agreed on 
>>it) log_source_port.
>>    
>>
>
>I have applied this patch.  It will be a great addition to PostgreSQL.
>
>  
>

Is there agreement on removing these 3 config vars?

cheers

andrew

Tue, 09 Mar 2004 10:02:14 -0500
Andrew Dunstan <andrew@dunslane.net>
Re: [PATCHES] log_line_info
Andrew Dunstan <andrew@dunslane.net> writes:
>>> After this is applied (fingers crossed) and everyone is happy, I will 
>>> submit a patch to remove log_timestamp, log_pid and (if we are agreed on 
>>> it) log_source_port.

> Is there agreement on removing these 3 config vars?

Now that I look at it, log_source_port does look pretty useless.
While you are at it, please clean up the confusion about whether
port->remote_host contains the port number or not (IMHO it should never
do so; BackendInit() is doing things in the wrong order).

			regards, tom lane

Tue, 09 Mar 2004 11:01:11 -0500
Tom Lane <tgl@sss.pgh.pa.us>
Re: [PATCHES] log_line_info 
> >>After this is applied (fingers crossed) and everyone is happy, I will 
> >>submit a patch to remove log_timestamp, log_pid and (if we are agreed on 
> >>it) log_source_port.

> Is there agreement on removing these 3 config vars?

There is from me.



Tue, 09 Mar 2004 11:38:17 -0500
Rod Taylor <pg@rbt.ca>
Re: [PATCHES] log_line_info
On Tue, 09 Mar 2004 10:02:14 -0500, Andrew Dunstan <andrew@dunslane.net>
wrote:
>>>After this is applied (fingers crossed) and everyone is happy, I will 
>>>submit a patch to remove log_timestamp, log_pid and (if we are agreed on 
>>>it) log_source_port.

>Is there agreement on removing these 3 config vars?

Please don't.  Declare them obsolete for 7.5 and remove them in a later
release.

Servus
 Manfred

Wed, 10 Mar 2004 11:54:09 +0100
Manfred Koizar <mkoi-pg@aon.at>
Re: [PATCHES] log_line_info
> Please don't.  Declare them obsolete for 7.5 and remove them in a later
> release.

Nah, just remove them.  We've removed, added and changed so many config
options and no-one's ever complained...

Chris



Wed, 10 Mar 2004 20:06:36 +0800 (WST)
Christopher Kings-Lynne <chriskl@familyhealth.com.au>
Re: [PATCHES] log_line_info
Christopher Kings-Lynne <chriskl@familyhealth.com.au> writes:
>> Please don't.  Declare them obsolete for 7.5 and remove them in a later
>> release.

> Nah, just remove them.  We've removed, added and changed so many config
> options and no-one's ever complained...

I agree with Chris; this would be taking compatibility concerns a bit
far.  None of these variables are likely to be touched except through
postgresql.conf (I don't think we even allow them to be SET interactively).
And you can never simply take your old .conf file and plop it down into
a new release.

			regards, tom lane

Wed, 10 Mar 2004 11:00:39 -0500
Tom Lane <tgl@sss.pgh.pa.us>
Re: [PATCHES] log_line_info 
Tom Lane wrote:

>I agree with Chris; this would be taking compatibility concerns a bit
>far.  None of these variables are likely to be touched except through
>postgresql.conf (I don't think we even allow them to be SET interactively).
>And you can never simply take your old .conf file and plop it down into
>a new release.
>
>  
>

Also, I selfishly want to get this out of my hair and move on :-)

The docs already state that log_source_port is useless.

patch forthcoming soon.

cheers

andrew

Wed, 10 Mar 2004 11:14:14 -0500
Andrew Dunstan <andrew@dunslane.net>
Re: [PATCHES] log_line_info
Tom Lane wrote:
> Christopher Kings-Lynne <chriskl@familyhealth.com.au> writes:
> >> Please don't.  Declare them obsolete for 7.5 and remove them in a later
> >> release.
> 
> > Nah, just remove them.  We've removed, added and changed so many config
> > options and no-one's ever complained...
> 
> I agree with Chris; this would be taking compatibility concerns a bit
> far.  None of these variables are likely to be touched except through
> postgresql.conf (I don't think we even allow them to be SET interactively).
> And you can never simply take your old .conf file and plop it down into
> a new release.

And the other reason to remove them is that if you don't, you will get
all sorts of confusion about people asking, "Which one should I use for
pid logging?  Looks like both work."

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

Wed, 10 Mar 2004 11:57:52 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: [PATCHES] log_line_info
Bruce Momjian wrote:

>Tom Lane wrote:
>  
>
>>Christopher Kings-Lynne <chriskl@familyhealth.com.au> writes:
>>    
>>
>>>>Please don't.  Declare them obsolete for 7.5 and remove them in a later
>>>>release.
>>>>        
>>>>
>>>Nah, just remove them.  We've removed, added and changed so many config
>>>options and no-one's ever complained...
>>>      
>>>
>>I agree with Chris; this would be taking compatibility concerns a bit
>>far.  None of these variables are likely to be touched except through
>>postgresql.conf (I don't think we even allow them to be SET interactively).
>>And you can never simply take your old .conf file and plop it down into
>>a new release.
>>    
>>
>
>And the other reason to remove them is that if you don't, you will get
>all sorts of confusion about people asking, "Which one should I use for
>pid logging?  Looks like both work."
>
>  
>
OK, Here's the patch. Also makes some minor improvements in the docco 
for log_line_prefix.

cheers

andrew
Wed, 10 Mar 2004 12:49:10 -0500
Andrew Dunstan <andrew@dunslane.net>
remove log_timestamp, log_pid and log_source_port GUC vars

Patch applied.  Thanks.

---------------------------------------------------------------------------


Andrew Dunstan wrote:
> Bruce Momjian wrote:
> 
> >Tom Lane wrote:
> >  
> >
> >>Christopher Kings-Lynne <chriskl@familyhealth.com.au> writes:
> >>    
> >>
> >>>>Please don't.  Declare them obsolete for 7.5 and remove them in a later
> >>>>release.
> >>>>        
> >>>>
> >>>Nah, just remove them.  We've removed, added and changed so many config
> >>>options and no-one's ever complained...
> >>>      
> >>>
> >>I agree with Chris; this would be taking compatibility concerns a bit
> >>far.  None of these variables are likely to be touched except through
> >>postgresql.conf (I don't think we even allow them to be SET interactively).
> >>And you can never simply take your old .conf file and plop it down into
> >>a new release.
> >>    
> >>
> >
> >And the other reason to remove them is that if you don't, you will get
> >all sorts of confusion about people asking, "Which one should I use for
> >pid logging?  Looks like both work."
> >
> >  
> >
> OK, Here's the patch. Also makes some minor improvements in the docco 
> for log_line_prefix.
> 
> cheers
> 
> andrew

> Index: doc/src/sgml/runtime.sgml
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/doc/src/sgml/runtime.sgml,v
> retrieving revision 1.248
> diff -c -r1.248 runtime.sgml
> *** doc/src/sgml/runtime.sgml	9 Mar 2004 23:15:47 -0000	1.248
> --- doc/src/sgml/runtime.sgml	10 Mar 2004 16:07:46 -0000
> ***************
> *** 1993,1999 ****
>          <para>
>           Causes the duration of every completed statement to be logged.
>           To use this option, it is recommended that you also enable
> !         <varname>log_statement</> and <varname>log_pid</> so that you
>           can link the statement to the duration using the process
>           ID. The default is off.  Only superusers can turn off this
>           option if it is enabled by the administrator.
> --- 1993,2000 ----
>          <para>
>           Causes the duration of every completed statement to be logged.
>           To use this option, it is recommended that you also enable
> !         <varname>log_statement</> and if not using <application>syslog</>
> ! 	 log the PID using <varname>log_line_prefix</> so that you
>           can link the statement to the duration using the process
>           ID. The default is off.  Only superusers can turn off this
>           option if it is enabled by the administrator.
> ***************
> *** 2014,2019 ****
> --- 2015,2022 ----
>   	 processes without controlling sessions. <application>Syslog</> produces its own
>   	 timestamp and process ID information, so you probably do not want to
>   	 use those escapes if you are using <application>syslog</>.
> + 	 This option can only be set at server start or in the
> +         <filename>postgresql.conf</filename> configuration file.
>   	 <informaltable>
>   	  <tgroup cols="3">
>   	   <thead>
> ***************
> *** 2058,2064 ****
>   	    <row>
>   	     <entry><literal>%c</literal></entry>
>   	     <entry>Session ID. A unique identifier for each session.
> ! 	     It is 2 4-byte hexadecimal numbers separated by a dot. The numbers
>   	     are the Session Start Time and the Process ID, so this can also
>   	     be used as a space saving way of printing these items.</entry>
>   	     <entry>Yes</entry>
> --- 2061,2068 ----
>   	    <row>
>   	     <entry><literal>%c</literal></entry>
>   	     <entry>Session ID. A unique identifier for each session.
> ! 	     It is 2 4-byte hexadecimal numbers (without leading zeros) 
> ! 	      separated by a dot. The numbers
>   	     are the Session Start Time and the Process ID, so this can also
>   	     be used as a space saving way of printing these items.</entry>
>   	     <entry>Yes</entry>
> ***************
> *** 2093,2111 ****
>         </listitem>
>        </varlistentry>
>   
> -      <varlistentry>
> -       <term><varname>log_pid</varname> (<type>boolean</type>)</term>
> -       <listitem>
> -        <para>
> -         Prefixes each message in the server log file with the process ID of
> -         the server process. This is useful to sort out which messages
> -         pertain to which connection. The default is off.  This parameter
> -         does not affect messages logged via <application>syslog</>, which 
> -         always contain the process ID.
> -        </para>
> -       </listitem>
> -      </varlistentry>
> - 
>        <varlistentry id="guc-log-statement" xreflabel="log_statement">
>         <term><varname>log_statement</varname> (<type>boolean</type>)</term>
>         <listitem>
> --- 2097,2102 ----
> ***************
> *** 2120,2135 ****
>         </listitem>
>        </varlistentry>
>   
> -      <varlistentry id="guc-log-timestamp" xreflabel="log_timestamp">
> -       <term><varname>log_timestamp</varname> (<type>boolean</type>)</term>
> -       <listitem>
> -        <para>
> -         Prefixes each server log message with a time stamp. The default
> -         is off.
> -        </para>
> -       </listitem>
> -      </varlistentry>
> - 
>        <varlistentry id="guc-log-hostname" xreflabel="log_hostname">
>         <term><varname>log_hostname</varname> (<type>boolean</type>)</term>
>         <listitem>
> --- 2111,2116 ----
> ***************
> *** 2143,2161 ****
>         </listitem>
>        </varlistentry>
>   
> -      <varlistentry id="guc-log-source-port" xreflabel="log_source_port">
> -       <term><varname>log_source_port</varname> (<type>boolean</type>)</term>
> -       <listitem>
> -        <para>
> -         Shows the outgoing port number of the connecting host in the
> -         connection log messages. You could trace back the port number
> -         to find out what user initiated the connection. Other than
> -         that, it's pretty useless and therefore off by default. This
> -         option can only be set at server start.
> -        </para>
> -       </listitem>
> -      </varlistentry>
> -      
>        </variablelist>
>       </sect3>
>      </sect2>
> --- 2124,2129 ----
> Index: src/backend/postmaster/postmaster.c
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/src/backend/postmaster/postmaster.c,v
> retrieving revision 1.372
> diff -c -r1.372 postmaster.c
> *** src/backend/postmaster/postmaster.c	9 Mar 2004 05:11:52 -0000	1.372
> --- src/backend/postmaster/postmaster.c	10 Mar 2004 16:07:46 -0000
> ***************
> *** 212,219 ****
>   int			CheckPointWarning = 30;
>   time_t		LastSignalledCheckpoint = 0;
>   
> ! bool		log_hostname;		/* for ps display */
> ! bool		LogSourcePort;
>   bool		Log_connections = false;
>   bool		Db_user_namespace = false;
>   
> --- 212,218 ----
>   int			CheckPointWarning = 30;
>   time_t		LastSignalledCheckpoint = 0;
>   
> ! bool		log_hostname;		/* for ps display and logging */
>   bool		Log_connections = false;
>   bool		Db_user_namespace = false;
>   
> ***************
> *** 2419,2424 ****
> --- 2418,2424 ----
>   	struct timezone tz;
>   	char		remote_host[NI_MAXHOST];
>   	char		remote_port[NI_MAXSERV];
> + 	char		remote_ps_data[NI_MAXHOST];
>   
>   	IsUnderPostmaster = true;	/* we are a postmaster subprocess now */
>   
> ***************
> *** 2479,2499 ****
>   						remote_port, sizeof(remote_port),
>   						NI_NUMERICHOST | NI_NUMERICSERV);
>   	}
>   
>   	if (Log_connections)
>   		ereport(LOG,
>   				(errmsg("connection received: host=%s port=%s",
>   						remote_host, remote_port)));
>   
> - 	if (LogSourcePort)
> - 	{
> - 		/* modify remote_host for use in ps status */
> - 		char		tmphost[NI_MAXHOST];
> - 
> - 		snprintf(tmphost, sizeof(tmphost), "%s(%s)", remote_host, remote_port);
> - 		StrNCpy(remote_host, tmphost, sizeof(remote_host));
> - 	}
> - 
>   	/*
>   	 * save remote_host and remote_port in port stucture
>   	 */
> --- 2479,2493 ----
>   						remote_port, sizeof(remote_port),
>   						NI_NUMERICHOST | NI_NUMERICSERV);
>   	}
> + 	snprintf(remote_ps_data, sizeof(remote_ps_data),
> + 			 remote_port[0] == '\0' ? "%s" : "%s(%s)",
> + 			 remote_host, remote_port);
>   
>   	if (Log_connections)
>   		ereport(LOG,
>   				(errmsg("connection received: host=%s port=%s",
>   						remote_host, remote_port)));
>   
>   	/*
>   	 * save remote_host and remote_port in port stucture
>   	 */
> ***************
> *** 2522,2528 ****
>   	 * title for ps.  It's good to do this as early as possible in
>   	 * startup.
>   	 */
> ! 	init_ps_display(port->user_name, port->database_name, remote_host);
>   	set_ps_display("authentication");
>   
>   	/*
> --- 2516,2522 ----
>   	 * title for ps.  It's good to do this as early as possible in
>   	 * startup.
>   	 */
> ! 	init_ps_display(port->user_name, port->database_name, remote_ps_data);
>   	set_ps_display("authentication");
>   
>   	/*
> Index: src/backend/tcop/postgres.c
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/src/backend/tcop/postgres.c,v
> retrieving revision 1.394
> diff -c -r1.394 postgres.c
> *** src/backend/tcop/postgres.c	9 Mar 2004 04:43:07 -0000	1.394
> --- src/backend/tcop/postgres.c	10 Mar 2004 16:07:47 -0000
> ***************
> *** 3212,3222 ****
>   	snprintf(dbname, sizeof(dbname)," database=%s",port->database_name);
>   	snprintf(remote_host,sizeof(remote_host)," host=%s",
>   			 port->remote_host);
> ! 	/* prevent redundant or empty reporting of port */
> ! 	if (!LogSourcePort && strlen(port->remote_port))
> ! 		snprintf(remote_port,sizeof(remote_port)," port=%s",port->remote_port);
> ! 	else
> ! 		remote_port[0] = '\0';
>   
>   
>   	gettimeofday(&end,NULL);
> --- 3212,3218 ----
>   	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);
>   
>   
>   	gettimeofday(&end,NULL);
> Index: src/backend/utils/error/elog.c
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/src/backend/utils/error/elog.c,v
> retrieving revision 1.127
> diff -c -r1.127 elog.c
> *** src/backend/utils/error/elog.c	9 Mar 2004 04:43:07 -0000	1.127
> --- src/backend/utils/error/elog.c	10 Mar 2004 16:07:47 -0000
> ***************
> *** 69,77 ****
>   
>   /* GUC parameters */
>   PGErrorVerbosity Log_error_verbosity = PGERROR_VERBOSE;
> - bool		Log_timestamp = false;		/* show timestamps in stderr
> - 										 * output */
> - bool		Log_pid = false;	/* show PIDs in stderr output */
>   char       *Log_line_prefix = ""; /* format for extra log line info */
>   
>   #ifdef HAVE_SYSLOG
> --- 69,74 ----
> ***************
> *** 144,151 ****
>   static char *expand_fmt_string(const char *fmt, ErrorData *edata);
>   static const char *useful_strerror(int errnum);
>   static const char *error_severity(int elevel);
> - static const char *print_timestamp(void);
> - static const char *print_pid(void);
>   static void append_with_tabs(StringInfo buf, const char *str);
>   static const char *log_line_prefix(void);
>   
> --- 141,146 ----
> ***************
> *** 1134,1140 ****
>   				case 'r':
>   					j += snprintf(result+j,result_len-j,"%s",
>   								  MyProcPort->remote_host);
> ! 					if (!LogSourcePort && strlen(MyProcPort->remote_port))
>   						j += snprintf(result+j,result_len-j,"(%s)",
>   									  MyProcPort->remote_port);
>   					break;
> --- 1129,1135 ----
>   				case 'r':
>   					j += snprintf(result+j,result_len-j,"%s",
>   								  MyProcPort->remote_host);
> ! 					if (strlen(MyProcPort->remote_port) > 0)
>   						j += snprintf(result+j,result_len-j,"(%s)",
>   									  MyProcPort->remote_port);
>   					break;
> ***************
> *** 1293,1302 ****
>   		 * Timestamp and PID are only used for stderr output --- we assume
>   		 * the syslog daemon will supply them for us in the other case.
>   		 */
> ! 		fprintf(stderr, "%s%s%s",
> ! 				Log_timestamp ? print_timestamp() : "",
> ! 				Log_pid ? print_pid() : "",
> ! 				buf.data);
>   	}
>   
>   	pfree(buf.data);
> --- 1288,1294 ----
>   		 * Timestamp and PID are only used for stderr output --- we assume
>   		 * the syslog daemon will supply them for us in the other case.
>   		 */
> ! 		fprintf(stderr, "%s",buf.data);
>   	}
>   
>   	pfree(buf.data);
> ***************
> *** 1567,1609 ****
>   	return prefix;
>   }
>   
> - 
> - /*
> -  * Return a timestamp string like
> -  *
> -  *	 "2000-06-04 13:12:03 "
> -  */
> - static const char *
> - print_timestamp(void)
> - {
> - 	time_t		curtime;
> - 	static char buf[21];		/* format `YYYY-MM-DD HH:MM:SS ' */
> - 
> - 	curtime = time(NULL);
> - 
> - 	strftime(buf, sizeof(buf),
> - 			 "%Y-%m-%d %H:%M:%S ",
> - 			 localtime(&curtime));
> - 
> - 	return buf;
> - }
> - 
> - 
> - /*
> -  * Return a string like
> -  *
> -  *	   "[123456] "
> -  *
> -  * with the current pid.
> -  */
> - static const char *
> - print_pid(void)
> - {
> - 	static char buf[10];		/* allow `[123456] ' */
> - 
> - 	snprintf(buf, sizeof(buf), "[%d] ", (int) MyProcPid);
> - 	return buf;
> - }
>   
>   /*
>    *	append_with_tabs
> --- 1559,1564 ----
> Index: src/backend/utils/misc/guc.c
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/src/backend/utils/misc/guc.c,v
> retrieving revision 1.189
> diff -c -r1.189 guc.c
> *** src/backend/utils/misc/guc.c	9 Mar 2004 04:43:07 -0000	1.189
> --- src/backend/utils/misc/guc.c	10 Mar 2004 16:07:49 -0000
> ***************
> *** 508,529 ****
>   		&Log_disconnections,
>   		false, NULL, NULL
>   	},
> - 	{
> - 		{"log_timestamp", PGC_SIGHUP, LOGGING_WHAT,
> - 			gettext_noop("Prefixes server log messages with a time stamp."),
> - 			NULL
> - 		},
> - 		&Log_timestamp,
> - 		false, NULL, NULL
> - 	},
> - 	{
> - 		{"log_pid", PGC_SIGHUP, LOGGING_WHAT,
> - 			gettext_noop("Prefixes server log messages with the server PID."),
> - 			NULL
> - 		},
> - 		&Log_pid,
> - 		false, NULL, NULL
> - 	},
>   
>   #ifdef USE_ASSERT_CHECKING
>   	{
> --- 508,513 ----
> ***************
> *** 750,764 ****
>   		&log_hostname,
>   		false, NULL, NULL
>   	},
> - 	{
> - 		{"log_source_port", PGC_SIGHUP, LOGGING_WHAT,
> - 			gettext_noop("Logs the outgoing port number of the connecting host."),
> - 			NULL
> - 		},
> - 		&LogSourcePort,
> - 		false, NULL, NULL
> - 	},
> - 
>   	{
>   		{"sql_inheritance", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
>   			gettext_noop("Causes subtables to be included by default in various commands."),
> --- 734,739 ----
> Index: src/backend/utils/misc/postgresql.conf.sample
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v
> retrieving revision 1.107
> diff -c -r1.107 postgresql.conf.sample
> *** src/backend/utils/misc/postgresql.conf.sample	9 Mar 2004 04:43:07 -0000	1.107
> --- src/backend/utils/misc/postgresql.conf.sample	10 Mar 2004 16:07:49 -0000
> ***************
> *** 184,190 ****
>   #log_connections = false
>   #log_disconnections = false
>   #log_duration = false
> - #log_pid = false
>   #log_line_prefix = ''		# e.g. '<%u%%%d> ' 
>   				# %u=user name %d=database name
>   				# %r=remote host and port
> --- 184,189 ----
> ***************
> *** 194,202 ****
>   				# %x=stop here in non-session processes
>   				# %%='%'
>   #log_statement = false
> - #log_timestamp = false
>   #log_hostname = false
> - #log_source_port = false
>   
>   
>   #---------------------------------------------------------------------------
> --- 193,199 ----
> Index: src/include/tcop/tcopprot.h
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/src/include/tcop/tcopprot.h,v
> retrieving revision 1.61
> diff -c -r1.61 tcopprot.h
> *** src/include/tcop/tcopprot.h	29 Nov 2003 22:41:14 -0000	1.61
> --- src/include/tcop/tcopprot.h	10 Mar 2004 16:07:50 -0000
> ***************
> *** 30,36 ****
>   extern bool InError;
>   extern CommandDest whereToSendOutput;
>   extern bool log_hostname;
> - extern bool LogSourcePort;
>   extern DLLIMPORT const char *debug_query_string;
>   extern char *rendezvous_name;
>   
> --- 30,35 ----
> Index: src/include/utils/elog.h
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/src/include/utils/elog.h,v
> retrieving revision 1.65
> diff -c -r1.65 elog.h
> *** src/include/utils/elog.h	9 Mar 2004 04:43:07 -0000	1.65
> --- src/include/utils/elog.h	10 Mar 2004 16:07:50 -0000
> ***************
> *** 169,176 ****
>   } PGErrorVerbosity;
>   
>   extern PGErrorVerbosity Log_error_verbosity;
> - extern bool Log_timestamp;
> - extern bool Log_pid;
>   extern char *Log_line_prefix;
>   
>   #ifdef HAVE_SYSLOG
> --- 169,174 ----

> 
> ---------------------------(end of broadcast)---------------------------
> TIP 6: Have you searched our list archives?
> 
>                http://archives.postgresql.org

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

Mon, 15 Mar 2004 10:58:21 -0500 (EST)
Bruce Momjian <pgman@candle.pha.pa.us>
Re: remove log_timestamp, log_pid and log_source_port GUC