[Swift-commit] r7459 - trunk/libexec

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-01-03 16:31:17 -0600 (Fri, 03 Jan 2014)
New Revision: 7459

Modified:
   trunk/libexec/swift-int-staging.k
Log:
chain exception if reading stdout/err files fails

Modified: trunk/libexec/swift-int-staging.k
===================================================================
--- trunk/libexec/swift-int-staging.k	2014-01-02 21:30:54 UTC (rev 7458)
+++ trunk/libexec/swift-int-staging.k	2014-01-03 22:31:17 UTC (rev 7459)
@@ -85,7 +85,8 @@
 				cdmfile := cdm:file()
 
 				try {
-					log(LOG:DEBUG, "JOB_START jobid={jobid} tr={tr}", if (arguments != null, (" arguments=", arguments)), " tmpdir={tmpdir} host={rhost}")
+					log(LOG:DEBUG, "JOB_START jobid={jobid} tr={tr}", if (arguments != null, (" arguments=", arguments)), 
+						" tmpdir={tmpdir} host={rhost}")
 
 					setProgress(progress, "Submitting")
 
@@ -172,7 +173,7 @@
 					}
 					else {
 						setProgress(progress, "Failed but can retry")
-						exception := try(exception(readErrorFiles(ddir, jobid, stdout, stderr)), prev)
+						exception := try(exception(readErrorFiles(ddir, jobid, stdout, stderr), prev), prev)
 						log(LOG:DEBUG, "APPLICATION_EXCEPTION jobid={jobid} - Application exception: ", exception)
 					
 						throw(