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

Merge pull request #142 from eed3si9n/wip/settingnoise 

Filter out ":: loading settings"
This commit is contained in:
Dale Wijnand 2017-07-25 14:44:44 +01:00 committed by GitHub
parent ceadf9722a ace8d88f9f
commit bf733e782b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ivy/src/main/scala/sbt/internal/librarymanagement/IvyLogger.scala
View File

@ -7,7 +7,7 @@ import org.apache.ivy.util.{ Message, MessageLogger, MessageLoggerEngine }
import sbt.util.Logger import sbt.util.Logger
/** Interface to Ivy logging. */ /** Interface to Ivy logging. */
private final class IvyLoggerInterface(logger: Logger) extends MessageLogger { private[sbt] final class IvyLoggerInterface(logger: Logger) extends MessageLogger {
def rawlog(msg: String, level: Int): Unit = log(msg, level) def rawlog(msg: String, level: Int): Unit = log(msg, level)
def log(msg: String, level: Int): Unit = { def log(msg: String, level: Int): Unit = {
import Message.{ MSG_DEBUG, MSG_VERBOSE, MSG_INFO, MSG_WARN, MSG_ERR } import Message.{ MSG_DEBUG, MSG_VERBOSE, MSG_INFO, MSG_WARN, MSG_ERR }
@ -24,7 +24,7 @@ private final class IvyLoggerInterface(logger: Logger) extends MessageLogger {
def debug(msg: String): Unit = () def debug(msg: String): Unit = ()
def verbose(msg: String): Unit = logger.verbose(msg) def verbose(msg: String): Unit = logger.verbose(msg)
def deprecated(msg: String): Unit = warn(msg) def deprecated(msg: String): Unit = warn(msg)
def info(msg: String): Unit = logger.info(msg) def info(msg: String): Unit = if (SbtIvyLogger.acceptInfo(msg)) logger.info(msg)
def rawinfo(msg: String): Unit = info(msg) def rawinfo(msg: String): Unit = info(msg)
def warn(msg: String): Unit = logger.warn(msg) def warn(msg: String): Unit = logger.warn(msg)
def error(msg: String): Unit = if (SbtIvyLogger.acceptError(msg)) logger.error(msg) def error(msg: String): Unit = if (SbtIvyLogger.acceptError(msg)) logger.error(msg)
@ -43,13 +43,16 @@ private final class IvyLoggerInterface(logger: Logger) extends MessageLogger {
def isShowProgress = false def isShowProgress = false
def setShowProgress(progress: Boolean): Unit = () def setShowProgress(progress: Boolean): Unit = ()
} }
private final class SbtMessageLoggerEngine extends MessageLoggerEngine { private[sbt] final class SbtMessageLoggerEngine extends MessageLoggerEngine {
/** This is a hack to filter error messages about 'unknown resolver ...'. */ /** This is a hack to filter error messages about 'unknown resolver ...'. */
override def error(msg: String): Unit = if (SbtIvyLogger.acceptError(msg)) super.error(msg) override def error(msg: String): Unit = if (SbtIvyLogger.acceptError(msg)) super.error(msg)
override def sumupProblems(): Unit = clearProblems() override def sumupProblems(): Unit = clearProblems()
} }
private object SbtIvyLogger { private[sbt] object SbtIvyLogger {
val UnknownResolver = "unknown resolver" final val unknownResolver = "unknown resolver"
def acceptError(msg: String) = (msg ne null) && !msg.startsWith(UnknownResolver) def acceptError(msg: String) = (msg ne null) && !msg.startsWith(unknownResolver)
final val loadingSettings = ":: loading settings"
def acceptInfo(msg: String) = (msg ne null) && !msg.startsWith(loadingSettings)
} }