Chris Browne cbbrowne at lists.slony.info
Mon Feb 5 14:06:55 PST 2007
Update of /home/cvsd/slony1/slony1-engine/src/slonik
In directory main:/tmp/cvs-serv3327/src/slonik

Modified Files:
      Tag: REL_1_2_STABLE
	slonik.c 
Log Message:
Per change committed to HEAD on Jan 30th, this applies to the 1.2 branch

This addresses the problem where a slonik requests UNINSTALL NODE
and this breaks. 

Report in the error message which node it was working on. That way the
gentle user gets an indication as to which node 'broke' if the slonik
script contained multiple such UNINSTALL NODE requests.



Index: slonik.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.67.2.3
retrieving revision 1.67.2.4
diff -C2 -d -r1.67.2.3 -r1.67.2.4
*** slonik.c	12 Dec 2006 14:52:59 -0000	1.67.2.3
--- slonik.c	5 Feb 2007 22:06:53 -0000	1.67.2.4
***************
*** 3035,3038 ****
--- 3035,3039 ----
  	if (db_exec_command((SlonikStmt *) stmt, adminfo1, &query) < 0)
  	{
+ 		printf("Failed to exec uninstallNode() for node %d\n", stmt->no_id);
  		dstring_free(&query);
  		return -1;
***************
*** 3040,3043 ****
--- 3041,3045 ----
  	if (db_commit_xact((SlonikStmt *) stmt, adminfo1) < 0)
  	{
+ 		printf("Failed to commit uninstallNode() for node %d\n", stmt->no_id);
  		dstring_free(&query);
  		return -1;
***************
*** 3049,3052 ****
--- 3051,3055 ----
  	if (db_exec_command((SlonikStmt *) stmt, adminfo1, &query) < 0)
  	{
+ 		printf("Failed to drop schema for node %d\n", stmt->no_id);
  		dstring_free(&query);
  		return -1;
***************
*** 3054,3057 ****
--- 3057,3061 ----
  	if (db_commit_xact((SlonikStmt *) stmt, adminfo1) < 0)
  	{
+ 		printf("Failed to commit drop schema for node %d\n", stmt->no_id);
  		dstring_free(&query);
  		return -1;




More information about the Slony1-commit mailing list