From eb847fa1026242116261ba77684967fcd3818c0b Mon Sep 17 00:00:00 2001 From: Tad Jordan Date: Mon, 4 Feb 2013 13:40:40 -0500 Subject: [PATCH] Message "script failed" moved to the correct place in the code GSA-719 fixed --- .../src/org/broadinstitute/sting/queue/QCommandLine.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala b/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala index 9da2394bd..5e7ed8f2d 100644 --- a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala +++ b/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala @@ -113,6 +113,7 @@ class QCommandLine extends CommandLineProgram with Logging { def execute = { var success = false var result = 1 + var functionsAndStatusSize = 0 try { ClassFieldCache.parsingEngine = this.parser @@ -176,8 +177,7 @@ class QCommandLine extends CommandLineProgram with Logging { val scriptFunctions = functionsAndStatus.filterKeys(f => script.functions.contains(f)) script.onExecutionDone(scriptFunctions, success) } - - logger.info("Script %s with %d total jobs".format(if (success) "completed successfully" else "failed", functionsAndStatus.size)) + functionsAndStatusSize = functionsAndStatus.size // write the final complete job report logger.info("Writing final jobs report...") @@ -207,6 +207,7 @@ class QCommandLine extends CommandLineProgram with Logging { } } } + logger.info("Script %s with %d total jobs".format(if (success) "completed successfully" else "failed", functionsAndStatusSize)) result }