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

Merge pull request #4016 from dwijnand/cleanup/Watched 

Make Watched use State#handleError
This commit is contained in:
Dale Wijnand 2018-03-20 08:54:18 +00:00 committed by GitHub
parent b23980ce1b 9c0ac90ee9
commit fe418c92a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -383,6 +383,8 @@ lazy val commandProj = (project in file("main-command"))
// Replace nailgun socket stuff
exclude[MissingClassProblem]("sbt.internal.NG*"),
exclude[MissingClassProblem]("sbt.internal.ReferenceCountedFileDescriptor"),
// made private[sbt] method private[this]
exclude[DirectMissingMethodProblem]("sbt.State.handleException"),
),
unmanagedSources in (Compile, headerCreate) := {
val old = (unmanagedSources in (Compile, headerCreate)).value

2
main-command/src/main/scala/sbt/State.scala
View File

@ -323,7 +323,7 @@ object State {
import ExceptionCategory._
private[sbt] def handleException(t: Throwable, s: State, log: Logger): State = {
private[this] def handleException(t: Throwable, s: State, log: Logger): State = {
ExceptionCategory(t) match {
case AlreadyHandled => ()
case m: MessageOnly => log.error(m.message)

6
main-command/src/main/scala/sbt/Watched.scala
View File

@ -112,9 +112,9 @@ object Watched {
(triggered, newWatchState)
} catch {
case e: Exception =>
val log = s.log
log.error("Error occurred obtaining files to watch. Terminating continuous execution...")
State.handleException(e, s, log)
s.log.error(
"Error occurred obtaining files to watch. Terminating continuous execution...")
s.handleError(e)
(false, watchState)
}