[Swift-commit] r4380 - trunk/libexec

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-04-15 20:00:22 -0500 (Fri, 15 Apr 2011)
New Revision: 4380

Modified:
   trunk/libexec/vdl-int-staging.k
Log:
proper staging out of wrapper logs

Modified: trunk/libexec/vdl-int-staging.k
===================================================================
--- trunk/libexec/vdl-int-staging.k	2011-04-16 00:20:59 UTC (rev 4379)
+++ trunk/libexec/vdl-int-staging.k	2011-04-16 01:00:22 UTC (rev 4380)
@@ -11,6 +11,10 @@
 global(LOG:ERROR, "error")
 global(LOG:FATAL, "fatal")
 
+global(WRAPPER_TRANSFER_MODE,
+	if(vdl:configProperty("wrapperlog.always.transfer") == "true", 
+		STAGING_MODE:IF_PRESENT, STAGING_MODE:ON_ERROR + STAGING_MODE:IF_PRESENT))
+
 namespace("vdl"
 	export(
 		element(initDDir, []
@@ -142,7 +146,8 @@
 
 							appStageins(jobid, stagein, ".", stagingMethod)
 
-							stageOut("wrapper.log", "{stagingMethod}://localhost/{ddir}/{jobid}.info")
+							stageOut("wrapper.log", "{stagingMethod}://localhost/{ddir}/{jobid}.info", 
+								mode = WRAPPER_TRANSFER_MODE)
 							//stageOut("{stdout}", "{stagingMethod}://localhost/{ddir}/{stdout}")
 							//stageOut("{stderr}", "{stagingMethod}://localhost/{ddir}/{stderr}")
 							appStageouts(jobid, stageout, ".", stagingMethod)
@@ -166,8 +171,7 @@
 									"Exception in {tr}:", nl(),
 									maybe("Arguments: {arguments}", nl()),
 									"Host: {rhost}", nl(),
-									"Directory: {tmpdir}",
-									"TODO: outs", nl(),
+									"Directory: {tmpdir}", nl(),
 									"- - -", nl()
 								)
 								exception