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

Handle exceptions thrown during triggered execution polling

This commit is contained in:
Mark Harrah 2011-04-26 21:06:54 -04:00
parent f8bcf910c2
commit 1c86e5781a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main/Watched.scala
View File

@ -9,8 +9,7 @@ package sbt
trait Watched trait Watched
{ {
/** A `PathFinder` that determines the files watched when an action is run with a preceeding ~ when this is the current /** The files watched when an action is run with a preceeding ~ */
* project. This project does not need to include the watched paths for projects that this project depends on.*/
def watchPaths(s: State): Seq[File] = Nil def watchPaths(s: State): Seq[File] = Nil
def terminateWatch(key: Int): Boolean = Watched.isEnter(key) def terminateWatch(key: Int): Boolean = Watched.isEnter(key)
/** The time in milliseconds between checking for changes. The actual time between the last change made to a file and the /** The time in milliseconds between checking for changes. The actual time between the last change made to a file and the
@ -43,7 +42,17 @@ object Watched
if(watchState.count > 0) if(watchState.count > 0)
System.out.println(watchState.count + ". Waiting for source changes... (press enter to interrupt)") System.out.println(watchState.count + ". Waiting for source changes... (press enter to interrupt)")
val (triggered, newWatchState) = SourceModificationWatch.watch(sourcesFinder, watched.pollInterval, watchState)(shouldTerminate) val (triggered, newWatchState, newState) =
try {
val (triggered, newWatchState) = SourceModificationWatch.watch(sourcesFinder, watched.pollInterval, watchState)(shouldTerminate)
(triggered, newWatchState, s)
}
catch { case e: Exception =>
val log = CommandSupport.logger(s)
log.error("Error occurred obtaining files to watch. Terminating continuous execution...")
BuiltinCommands.handleException(e, s, log)
(false, watchState, s.fail)
}
if(triggered) if(triggered)
(ClearOnFailure :: next :: FailureWall :: repeat :: s).put(ContinuousState, newWatchState) (ClearOnFailure :: next :: FailureWall :: repeat :: s).put(ContinuousState, newWatchState)