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

Use null ConsoleOut for RelayAppender 

The RelayAppender should not log directly to console out since it is
supposed to be relaying json log messages to connected clients. This was
manifesting as double printing on some success messages.
This commit is contained in:
Ethan Atkins 2020-09-10 16:37:24 -07:00
parent 67f6df0bdb
commit 3d6d847947
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala
View File

@ -21,6 +21,13 @@ sealed trait ConsoleOut {
object ConsoleOut {
def systemOut: ConsoleOut = terminalOut
private[sbt] object NullConsoleOut extends ConsoleOut {
override val lockObject: AnyRef = this
override def print(s: String): Unit = {}
override def println(): Unit = {}
override def println(s: String): Unit = {}
override def flush(): Unit = {}
}
private[sbt] def globalProxy: ConsoleOut = Proxy
private[sbt] def setGlobalProxy(out: ConsoleOut): Unit = Proxy.set(out)
private[sbt] def getGlobalProxy: ConsoleOut = Proxy.proxy.get

2
main/src/main/scala/sbt/internal/RelayAppender.scala
View File

@ -15,7 +15,7 @@ import sbt.util.Level
class RelayAppender(override val name: String)
extends ConsoleAppender(
name,
ConsoleAppender.Properties.from(ConsoleOut.globalProxy, true, true),
ConsoleAppender.Properties.from(ConsoleOut.NullConsoleOut, true, true),
_ => None
) {
lazy val exchange = StandardMain.exchange