Make showProgress configurable

This commit is contained in:
Eugene Yokota 2019-03-07 16:49:54 -05:00
parent 8215026bc3
commit d496a5dff5
1 changed files with 4 additions and 16 deletions

View File

@ -3,7 +3,7 @@ package sbt.internal.util
import sbt.util._
import java.io.{ PrintStream, PrintWriter }
import java.util.Locale
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger }
import org.apache.logging.log4j.{ Level => XLevel }
import org.apache.logging.log4j.message.{ Message, ObjectMessage, ReusableObjectMessage }
import org.apache.logging.log4j.core.{ LogEvent => XLogEvent }
@ -105,6 +105,9 @@ object ConsoleAppender {
private[this] val widthHolder: AtomicInteger = new AtomicInteger
private[sbt] def terminalWidth = widthHolder.get
private[sbt] def setTerminalWidth(n: Int): Unit = widthHolder.set(n)
private[this] val showProgressHolder: AtomicBoolean = new AtomicBoolean(false)
def setShowProgress(b: Boolean): Unit = showProgressHolder.set(b)
def showProgress: Boolean = showProgressHolder.get
/** Hide stack trace altogether. */
val noSuppressedMessage = (_: SuppressedTraceContext) => None
@ -141,21 +144,6 @@ object ConsoleAppender {
}
}
/**
* Indicates whether the super shell is enabled.
*/
lazy val showProgress: Boolean =
formatEnabledInEnv && sys.props
.get("sbt.progress")
.flatMap({ s =>
parseLogOption(s) match {
case LogOption.Always => Some(true)
case LogOption.Never => Some(false)
case _ => None
}
})
.getOrElse(true)
private[sbt] def parseLogOption(s: String): LogOption =
s.toLowerCase match {
case "always" => LogOption.Always