luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

log toString of exception in non-main threads to indicate a trace exists. fixes #157

This commit is contained in:
Mark Harrah 2011-08-23 19:53:33 -04:00
parent 9ebf809259
commit b40a2f31ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
run/TrapExit.scala
View File

@ -38,7 +38,7 @@ object TrapExit
code.set(1) //exceptions in the main thread cause the exit code to be 1
throw x
}
val customThreadGroup = new ExitThreadGroup(new ExitHandler(Thread.getDefaultUncaughtExceptionHandler, originalThreads, code, log))
val customThreadGroup = new ExitThreadGroup(new ExitHandler(originalThreads, code, log))
val executionThread = new Thread(customThreadGroup, "run-main") { override def run() { executeMain } }
val originalSecurityManager = System.getSecurityManager
@ -168,7 +168,7 @@ object TrapExit
}
/** An uncaught exception handler that delegates to the original uncaught exception handler except when
* the cause was a call to System.exit (which generated a SecurityException)*/
private final class ExitHandler(originalHandler: Thread.UncaughtExceptionHandler, originalThreads: Set[Thread], codeHolder: ExitCode, log: Logger) extends Thread.UncaughtExceptionHandler
private final class ExitHandler(originalThreads: Set[Thread], codeHolder: ExitCode, log: Logger) extends Thread.UncaughtExceptionHandler
{
def uncaughtException(t: Thread, e: Throwable)
{
@ -180,8 +180,8 @@ object TrapExit
catch
{
case _ =>
log.error("(" + t.getName + ") " + e.toString)
log.trace(e)
originalHandler.uncaughtException(t, e)
}
}
}

2
sbt/src/sbt-test/run/fork/test
View File

@ -3,7 +3,7 @@ $ exists flag
$ delete flag
$ mkdir "forked"
> set fork :== true
> set fork := true
> 'set baseDirectory in run <<= baseDirectory(_ / "forked")'
> run "forked"