[Swift-commit] r6012 - trunk/libexec

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2012-11-09 23:17:38 -0600 (Fri, 09 Nov 2012)
New Revision: 6012

Modified:
   trunk/libexec/vdl-int-staging.k
   trunk/libexec/vdl-int.k
Log:
nice app exceptions

Modified: trunk/libexec/vdl-int-staging.k
===================================================================
--- trunk/libexec/vdl-int-staging.k	2012-11-10 05:15:21 UTC (rev 6011)
+++ trunk/libexec/vdl-int-staging.k	2012-11-10 05:17:38 UTC (rev 6012)
@@ -180,10 +180,9 @@
 							exception(
 								concat(
 									"Exception in {tr}:", nl(),
-									maybe("Arguments: {arguments}", nl()),
-									"Host: {rhost}", nl(),
-									"Directory: {tmpdir}", nl(),
-									"- - -", nl()
+									maybe("    Arguments: {arguments}", nl()),
+									"    Host: {rhost}", nl(),
+									"    Directory: {tmpdir}", nl(),
 								)
 								exception
 							)

Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k	2012-11-10 05:15:21 UTC (rev 6011)
+++ trunk/libexec/vdl-int.k	2012-11-10 05:17:38 UTC (rev 6012)
@@ -368,16 +368,15 @@
 				for(f, list(list("stderr.txt", stderr), list("stdout.txt", stdout))
 					[name, file] := each(f)
 					destfile := "{jobid}-{file}"
-					nl()
-					"{name}: "
 					try(
 						sequential(
 							task:transfer(srchost=rhost, srcdir=tmpdir, srcfile=file,
 								destfile=destfile)
-
+							nl()
+							"    {name}: "
 							file:read(destfile)
 						)
-						nl()
+						""
 					)
 					maybe(file:remove(destfile))
 				)
@@ -599,11 +598,10 @@
 							exception(
 								concat(
 									"Exception in {tr}:", nl(),
-									maybe("Arguments: ", arguments, nl()),
-									"Host: {rhost}", nl(),
-									"Directory: {tmpdir}",
-									"{outs}", nl(),
-									"----", nl(),
+									maybe("    Arguments: ", arguments, nl()),
+									"    Host: {rhost}", nl(),
+									"    Directory: {tmpdir}",
+									"{outs}",
 									kickstartRec
 								)
 								exception