Steve Singer,,, ssinger at lists.slony.info
Wed Jul 7 07:39:24 PDT 2010
Update of /home/cvsd/slony1/slony1-engine/src/slony_logshipper
In directory main.slony.info:/tmp/cvs-serv23755/src/slony_logshipper

Modified Files:
	slony_logshipper.c ipcutil.c 
Log Message:
Log shipping fixes
-
-Proper fix for checking for the proper return code to indicate no files
are queued for processing. This will allow log_shipper to sleep waiting for
more work when no files are ready for processing.  The previous commit was
the wrong commit.

Merged from 2.0

Index: slony_logshipper.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slony_logshipper/slony_logshipper.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** slony_logshipper.c	7 Jul 2010 14:33:28 -0000	1.5
--- slony_logshipper.c	7 Jul 2010 14:39:22 -0000	1.6
***************
*** 371,375 ****
  			break;
  
! 		if (rc == -3)
  		{
  			archscan_sort = NULL;
--- 371,375 ----
  			break;
  
! 		if (rc == -2)
  		{
  			archscan_sort = NULL;

Index: ipcutil.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slony_logshipper/ipcutil.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** ipcutil.c	17 Aug 2009 17:25:50 -0000	1.5
--- ipcutil.c	7 Jul 2010 14:39:22 -0000	1.6
***************
*** 453,457 ****
  		{
  			if (errno == ENOMSG)
! 				return -1;
  			if (errno == EINTR)
  				continue;
--- 453,457 ----
  		{
  			if (errno == ENOMSG)
! 				return -2;
  			if (errno == EINTR)
  				continue;



More information about the Slony1-commit mailing list