Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main:/tmp/cvs-serv30382/src/slon

Modified Files:
      Tag: REL_1_1_STABLE
	confoptions.h remote_listen.c 
Log Message:
Added a new conf file option for slon - remote_listen_timeout

This helps if you have a slon down for a Very Long Time so that sl_event
bloats and causes the query on it to time out.



Index: remote_listen.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_listen.c,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -C2 -d -r1.21.2.2 -r1.21.2.3
*** remote_listen.c	6 Jan 2006 17:07:47 -0000	1.21.2.2
--- remote_listen.c	2 Feb 2007 20:22:59 -0000	1.21.2.3
***************
*** 58,61 ****
--- 58,62 ----
  							SlonConn * conn, struct listat *listat);
  
+ int remote_listen_timeout;
  
  
***************
*** 655,659 ****
  	}
  	time(&timeout);
! 	timeout += 300;
  	while (PQisBusy(conn->dbconn) != 0)
  	{
--- 656,660 ----
  	}
  	time(&timeout);
! 	timeout += remote_listen_timeout;
  	while (PQisBusy(conn->dbconn) != 0)
  	{
***************
*** 662,667 ****
  		{
  			slon_log(SLON_ERROR,
! 				 "remoteListenThread_%d: timeout for event selection\n",
! 				 node->no_id);
  			dstring_free(&query);
  			return -1;
--- 663,668 ----
  		{
  			slon_log(SLON_ERROR,
! 				 "remoteListenThread_%d: timeout (%d s) for event selection\n",
! 				 node->no_id, remote_listen_timeout);
  			dstring_free(&query);
  			return -1;

Index: confoptions.h
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/confoptions.h,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C2 -d -r1.23.2.1 -r1.23.2.2
*** confoptions.h	30 Jun 2005 17:11:52 -0000	1.23.2.1
--- confoptions.h	2 Feb 2007 20:22:59 -0000	1.23.2.2
***************
*** 189,192 ****
--- 189,204 ----
  	},
  #endif
+ 	{
+ 		{
+ 			(const char *)"remote_listen_timeout",		/* conf name */
+ 			gettext_noop("How long to wait, in seconds, before timeout when querying for remote events"),		/* short desc */
+ 			gettext_noop("How long to wait, in seconds, before timeout when querying for remote events"),		/* long desc */
+ 			SLON_C_INT			/* config type */
+ 		},
+ 		&remote_listen_timeout,			/* var name */
+ 		300,					/* default val */
+ 		30,					/* min val */
+ 		30000					/* max val */
+ 	},
      {0}
  };