*** pgsql/src/backend/access/transam/xlog.c	2010/02/12 07:56:36	1.372
--- pgsql/src/backend/access/transam/xlog.c	2010/02/12 09:49:08	1.373
***************
*** 7,13 ****
   * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.371 2010/02/12 07:36:44 heikki Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 7,13 ----
   * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.372 2010/02/12 07:56:36 heikki Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** readRecoveryCommandFile(void)
*** 4882,4890 ****
  						RECOVERY_COMMAND_FILE)));
  	}
  
- 	ereport(LOG,
- 			(errmsg("starting archive recovery")));
- 
  	/*
  	 * Parse the file...
  	 */
--- 4882,4887 ----
*************** readRecoveryCommandFile(void)
*** 4927,4940 ****
  		if (strcmp(tok1, "restore_command") == 0)
  		{
  			recoveryRestoreCommand = pstrdup(tok2);
! 			ereport(LOG,
  					(errmsg("restore_command = '%s'",
  							recoveryRestoreCommand)));
  		}
  		else if (strcmp(tok1, "recovery_end_command") == 0)
  		{
  			recoveryEndCommand = pstrdup(tok2);
! 			ereport(LOG,
  					(errmsg("recovery_end_command = '%s'",
  							recoveryEndCommand)));
  		}
--- 4924,4937 ----
  		if (strcmp(tok1, "restore_command") == 0)
  		{
  			recoveryRestoreCommand = pstrdup(tok2);
! 			ereport(DEBUG2,
  					(errmsg("restore_command = '%s'",
  							recoveryRestoreCommand)));
  		}
  		else if (strcmp(tok1, "recovery_end_command") == 0)
  		{
  			recoveryEndCommand = pstrdup(tok2);
! 			ereport(DEBUG2,
  					(errmsg("recovery_end_command = '%s'",
  							recoveryEndCommand)));
  		}
*************** readRecoveryCommandFile(void)
*** 4953,4962 ****
  									tok2)));
  			}
  			if (rtli)
! 				ereport(LOG,
  						(errmsg("recovery_target_timeline = %u", rtli)));
  			else
! 				ereport(LOG,
  						(errmsg("recovery_target_timeline = latest")));
  		}
  		else if (strcmp(tok1, "recovery_target_xid") == 0)
--- 4950,4959 ----
  									tok2)));
  			}
  			if (rtli)
! 				ereport(DEBUG2,
  						(errmsg("recovery_target_timeline = %u", rtli)));
  			else
! 				ereport(DEBUG2,
  						(errmsg("recovery_target_timeline = latest")));
  		}
  		else if (strcmp(tok1, "recovery_target_xid") == 0)
*************** readRecoveryCommandFile(void)
*** 4967,4973 ****
  				ereport(FATAL,
  				 (errmsg("recovery_target_xid is not a valid number: \"%s\"",
  						 tok2)));
! 			ereport(LOG,
  					(errmsg("recovery_target_xid = %u",
  							recoveryTargetXid)));
  			recoveryTarget = true;
--- 4964,4970 ----
  				ereport(FATAL,
  				 (errmsg("recovery_target_xid is not a valid number: \"%s\"",
  						 tok2)));
! 			ereport(DEBUG2,
  					(errmsg("recovery_target_xid = %u",
  							recoveryTargetXid)));
  			recoveryTarget = true;
*************** readRecoveryCommandFile(void)
*** 4992,4998 ****
  														CStringGetDatum(tok2),
  												ObjectIdGetDatum(InvalidOid),
  														Int32GetDatum(-1)));
! 			ereport(LOG,
  					(errmsg("recovery_target_time = '%s'",
  							timestamptz_to_str(recoveryTargetTime))));
  		}
--- 4989,4995 ----
  														CStringGetDatum(tok2),
  												ObjectIdGetDatum(InvalidOid),
  														Int32GetDatum(-1)));
! 			ereport(DEBUG2,
  					(errmsg("recovery_target_time = '%s'",
  							timestamptz_to_str(recoveryTargetTime))));
  		}
*************** readRecoveryCommandFile(void)
*** 5005,5011 ****
  				ereport(ERROR,
  						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
  						 errmsg("parameter \"recovery_target_inclusive\" requires a Boolean value")));
! 			ereport(LOG,
  					(errmsg("recovery_target_inclusive = %s", tok2)));
  		}
  		else if (strcmp(tok1, "standby_mode") == 0)
--- 5002,5008 ----
  				ereport(ERROR,
  						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
  						 errmsg("parameter \"recovery_target_inclusive\" requires a Boolean value")));
! 			ereport(DEBUG2,
  					(errmsg("recovery_target_inclusive = %s", tok2)));
  		}
  		else if (strcmp(tok1, "standby_mode") == 0)
*************** readRecoveryCommandFile(void)
*** 5014,5033 ****
  				ereport(ERROR,
  						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
  						 errmsg("parameter \"standby_mode\" requires a Boolean value")));
! 			ereport(LOG,
  					(errmsg("standby_mode = '%s'", tok2)));
  		}
  		else if (strcmp(tok1, "primary_conninfo") == 0)
  		{
  			PrimaryConnInfo = pstrdup(tok2);
! 			ereport(LOG,
  					(errmsg("primary_conninfo = '%s'",
  							PrimaryConnInfo)));
  		}
  		else if (strcmp(tok1, "trigger_file") == 0)
  		{
  			TriggerFile = pstrdup(tok2);
! 			ereport(LOG,
  					(errmsg("trigger_file = '%s'",
  							TriggerFile)));
  		}
--- 5011,5030 ----
  				ereport(ERROR,
  						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
  						 errmsg("parameter \"standby_mode\" requires a Boolean value")));
! 			ereport(DEBUG2,
  					(errmsg("standby_mode = '%s'", tok2)));
  		}
  		else if (strcmp(tok1, "primary_conninfo") == 0)
  		{
  			PrimaryConnInfo = pstrdup(tok2);
! 			ereport(DEBUG2,
  					(errmsg("primary_conninfo = '%s'",
  							PrimaryConnInfo)));
  		}
  		else if (strcmp(tok1, "trigger_file") == 0)
  		{
  			TriggerFile = pstrdup(tok2);
! 			ereport(DEBUG2,
  					(errmsg("trigger_file = '%s'",
  							TriggerFile)));
  		}
*************** StartupXLOG(void)
*** 5649,5656 ****
  		 */
  		if (InArchiveRecovery)
  		{
! 			ereport(LOG,
! 					(errmsg("automatic recovery in progress")));
  			ControlFile->state = DB_IN_ARCHIVE_RECOVERY;
  		}
  		else
--- 5646,5668 ----
  		 */
  		if (InArchiveRecovery)
  		{
! 			if (StandbyMode)
! 				ereport(LOG,
! 						(errmsg("entering standby mode")));
! 			else if (recoveryTarget)
! 			{
! 				if (recoveryTargetExact)
! 					ereport(LOG,
! 							(errmsg("starting point-in-time recovery to XID %u",
! 									recoveryTargetXid)));
! 				else
! 					ereport(LOG,
! 							(errmsg("starting point-in-time recovery to %s",
! 									timestamptz_to_str(recoveryTargetTime))));
! 			}
! 			else
! 				ereport(LOG,
! 						(errmsg("starting archive recovery")));
  			ControlFile->state = DB_IN_ARCHIVE_RECOVERY;
  		}
  		else
*************** StartupXLOG(void)
*** 5718,5725 ****
  
  			CheckRequiredParameterValues(checkPoint);
  
! 			ereport(LOG,
! 				(errmsg("initializing recovery connections")));
  
  			InitRecoveryTransactionEnvironment();
  
--- 5730,5737 ----
  
  			CheckRequiredParameterValues(checkPoint);
  
! 			ereport(DEBUG1,
! 					(errmsg("initializing recovery connections")));
  
  			InitRecoveryTransactionEnvironment();