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

Merge pull request #80 from eed3si9n/wip/logging2 

Fixes buffered log appender
This commit is contained in:
Dale Wijnand 2017-05-18 06:48:55 +01:00 committed by GitHub
parent ecf3dd3ae8 f2cc5ee775
commit 471ee7fdc4
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -2,7 +2,7 @@ import Dependencies._
import Util._ import Util._
import com.typesafe.tools.mima.core._, ProblemFilters._ import com.typesafe.tools.mima.core._, ProblemFilters._
def baseVersion: String = "1.0.0-M21" def baseVersion: String = "1.0.0-M24"
def internalPath = file("internal") def internalPath = file("internal")
def commonSettings: Seq[Setting[_]] = Seq( def commonSettings: Seq[Setting[_]] = Seq(

2
internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala
View File

@ -38,7 +38,7 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append
def append(event: XLogEvent): Unit = def append(event: XLogEvent): Unit =
{ {
if (recording) { if (recording) {
buffer += event buffer += event.toImmutable
} else delegate.append(event) } else delegate.append(event)
} }

2
internal/util-logging/src/main/scala/sbt/internal/util/ObjectEvent.scala
View File

@ -15,6 +15,8 @@ final class ObjectEvent[A](
val contentType: String, val contentType: String,
val json: JValue val json: JValue
) extends Serializable { ) extends Serializable {
override def toString: String =
s"ObjectEvent($level, $message, $channelName, $execId, $contentType, $json)"
} }
object ObjectEvent { object ObjectEvent {