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

Modified Files:
	confoptions.c 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.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** remote_listen.c	27 Oct 2006 20:10:57 -0000	1.32
--- remote_listen.c	2 Feb 2007 20:24:16 -0000	1.33
***************
*** 64,67 ****
--- 64,68 ----
  
  extern char *lag_interval;
+ int remote_listen_timeout;
  
  /* ----------
***************
*** 731,735 ****
  	}
  	time(&timeout);
! 	timeout += 300;
  	while (PQisBusy(conn->dbconn) != 0)
  	{
--- 732,736 ----
  	}
  	time(&timeout);
! 	timeout += remote_listen_timeout;
  	while (PQisBusy(conn->dbconn) != 0)
  	{
***************
*** 738,743 ****
  		{
  			slon_log(SLON_ERROR,
! 					 "remoteListenThread_%d: timeout for event selection\n",
! 					 node->no_id);
  			dstring_free(&query);
  			return -1;
--- 739,744 ----
  		{
  			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.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/confoptions.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** confoptions.c	2 Jan 2007 20:16:58 -0000	1.20
--- confoptions.c	2 Feb 2007 20:24:16 -0000	1.21
***************
*** 678,681 ****
--- 678,696 ----
  		1073741824					/* max val */
  	},
+ 
+ 	{
+ 		{
+ 			(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}}
  };