[Box Backup-commit] COMMIT r2514 - box/trunk/infrastructure

[boxbackup-dev at boxbackup.org]

Author: chris
Date: 2009-04-26 20:26:07 +0100 (Sun, 26 Apr 2009)
New Revision: 2514

Modified:
   box/trunk/infrastructure/makebuildenv.pl.in
Log:
Put the shell script that kills all running daemons into a shell
function to avoid repetition.


Modified: box/trunk/infrastructure/makebuildenv.pl.in
===================================================================
--- box/trunk/infrastructure/makebuildenv.pl.in	2009-04-26 18:41:41 UTC (rev 2513)
+++ box/trunk/infrastructure/makebuildenv.pl.in	2009-04-26 19:26:07 UTC (rev 2514)
@@ -428,11 +428,16 @@
 			if (-d "$module/testfiles")
 			{
 				print TESTFILE <<__E;
+kill_daemons()
+{
+	kill_process bbackupd
+	kill_process bbstored
+	kill_process httpserver
+	kill_process s3simulator
+}
+
 echo Killing any running daemons...
-kill_process bbackupd
-kill_process bbstored
-kill_process httpserver
-kill_process s3simulator
+kill_daemons
 __E
 			}
 
@@ -459,8 +464,7 @@
 			if (-d "$module/testfiles")
 			{
 				print TESTFILE <<__E;
-kill_process bbackupd
-kill_process bbstored
+kill_daemons
 __E
 			}