[open-ils-commits] r15203 - trunk/Open-ILS/src/sql/Pg (scottmk)

svn at svn.open-ils.org svn at svn.open-ils.org
Sat Dec 19 16:29:05 EST 2009


Author: scottmk
Date: 2009-12-19 16:29:00 -0500 (Sat, 19 Dec 2009)
New Revision: 15203

Modified:
   trunk/Open-ILS/src/sql/Pg/999.functions.global.sql
Log:
1. In the parent router process: wait for all of the immediate
child processes to terminate before exiting.

This change eliminates the need for the shell script invoking
the router to sleep before running a ps to identify the effective
router processes (which are grandchildren of the parent).  By the
time the parent exits, the children will have launched the
grandchildren and exited.

2. If any of the immediate child processes terminates abnormally
(either a non-zero return code or termination by a signal), issue
a warning message to that effect.  This message goes to standard
error, since the parent process never opens a log file.

3. Apply the volatile qualifier to a couple of variables that
are updated asynchronously by a signal handler.

M    Open-ILS/src/sql/Pg/999.functions.global.sql


Modified: trunk/Open-ILS/src/sql/Pg/999.functions.global.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/999.functions.global.sql	2009-12-18 21:55:56 UTC (rev 15202)
+++ trunk/Open-ILS/src/sql/Pg/999.functions.global.sql	2009-12-19 21:29:00 UTC (rev 15203)
@@ -222,6 +222,7 @@
 
     -- acq.*
     UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr;
+    UPDATE acq.fund_transfer SET transfer_user = dest_usr WHERE transfer_user = src_usr;
 
 	-- transfer picklists the same way we transfer buckets (see above)
 	FOR picklist_row in
@@ -383,6 +384,7 @@
 
 	-- acq.*
 	UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr;
+    UPDATE acq.fund_transfer SET transfer_user = dest_usr WHERE transfer_user = src_usr;
 	UPDATE acq.lineitem SET creator = dest_usr WHERE creator = src_usr;
 	UPDATE acq.lineitem SET editor = dest_usr WHERE editor = src_usr;
 	UPDATE acq.lineitem SET selector = dest_usr WHERE selector = src_usr;



More information about the open-ils-commits mailing list