From 27b65dcc3d91eb7bfe158eb292b56204e76e685f Mon Sep 17 00:00:00 2001 From: scottmk Date: Sat, 19 Dec 2009 21:29:00 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.open-ils.org/ILS/trunk@15203 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/999.functions.global.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Open-ILS/src/sql/Pg/999.functions.global.sql b/Open-ILS/src/sql/Pg/999.functions.global.sql index fd1937a9dc..87a0752700 100644 --- a/Open-ILS/src/sql/Pg/999.functions.global.sql +++ b/Open-ILS/src/sql/Pg/999.functions.global.sql @@ -222,6 +222,7 @@ BEGIN -- 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 @@ BEGIN -- 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; -- 2.11.0