erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Shut down the executor in case of an exception.

Browse source
This commit is contained in:
Cedric Beust 2015-10-24 15:47:26 -07:00
parent 6ea1d9b227
commit 60efa73998
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt
View file

@ -1,9 +1,10 @@
package com.beust.kobalt.internal package com.beust.kobalt.internal
import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.misc.NamedThreadFactory import com.beust.kobalt.misc.NamedThreadFactory
import com.beust.kobalt.misc.ToString import com.beust.kobalt.misc.ToString
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.common.collect.ArrayListMultimap import com.beust.kobalt.misc.KobaltLogger.*
import com.google.common.collect.HashMultimap import com.google.common.collect.HashMultimap
import java.util.concurrent.* import java.util.concurrent.*
@ -45,7 +46,8 @@ public class DynamicGraphExecutor<T>(val graph: DynamicGraph<T>,
*/ */
public fun run() : Int { public fun run() : Int {
var lastResult = TaskResult() var lastResult = TaskResult()
while (graph.freeNodes.size > 0) { var gotError = false
while (graph.freeNodes.size > 0 && ! gotError) {
log(3, "Current count: ${graph.nodeCount}") log(3, "Current count: ${graph.nodeCount}")
synchronized(graph) { synchronized(graph) {
val freeNodes = graph.freeNodes val freeNodes = graph.freeNodes
@ -56,7 +58,7 @@ public class DynamicGraphExecutor<T>(val graph: DynamicGraph<T>,
var n = callables.size var n = callables.size
// When a callable ends, see if it freed a node. If not, keep looping // When a callable ends, see if it freed a node. If not, keep looping
while (n > 0 && graph.freeNodes.size == 0) { while (n > 0 && graph.freeNodes.size == 0 && ! gotError) {
try { try {
val future = completion.take() val future = completion.take()
val taskResult = future.get(2, TimeUnit.SECONDS) val taskResult = future.get(2, TimeUnit.SECONDS)
@ -71,6 +73,9 @@ public class DynamicGraphExecutor<T>(val graph: DynamicGraph<T>,
}) })
} catch(ex: TimeoutException) { } catch(ex: TimeoutException) {
log(2, "Time out") log(2, "Time out")
} catch(ex: Exception) {
log(1, "Tests failed: ${ex.message}")
gotError = true
} }
} }
} }