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

Merge pull request #70 from eed3si9n/wip/fixappender 

Handle ReusableObjectMessage
This commit is contained in:
Dale Wijnand 2017-01-18 12:01:55 +00:00 committed by GitHub
parent 5b8de3abca ca6a0be602
commit 857dbf97fe
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -2,11 +2,11 @@ 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-M18" def baseVersion: String = "1.0.0-M19"
def internalPath = file("internal") def internalPath = file("internal")
def commonSettings: Seq[Setting[_]] = Seq( def commonSettings: Seq[Setting[_]] = Seq(
scalaVersion := scala211, scalaVersion := scala212,
// publishArtifact in packageDoc := false, // publishArtifact in packageDoc := false,
resolvers += Resolver.typesafeIvyRepo("releases"), resolvers += Resolver.typesafeIvyRepo("releases"),
resolvers += Resolver.sonatypeRepo("snapshots"), resolvers += Resolver.sonatypeRepo("snapshots"),

11
internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
View File

@ -5,7 +5,7 @@ import java.io.{ PrintStream, PrintWriter }
import java.util.Locale import java.util.Locale
import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicInteger
import org.apache.logging.log4j.{ Level => XLevel } import org.apache.logging.log4j.{ Level => XLevel }
import org.apache.logging.log4j.message.{ Message, ParameterizedMessage, ObjectMessage } import org.apache.logging.log4j.message.{ Message, ParameterizedMessage, ObjectMessage, ReusableObjectMessage }
import org.apache.logging.log4j.core.{ LogEvent => XLogEvent } import org.apache.logging.log4j.core.{ LogEvent => XLogEvent }
import org.apache.logging.log4j.core.appender.AbstractAppender import org.apache.logging.log4j.core.appender.AbstractAppender
import org.apache.logging.log4j.core.layout.PatternLayout import org.apache.logging.log4j.core.layout.PatternLayout
@ -244,10 +244,11 @@ class ConsoleAppender private[ConsoleAppender] (
def messageToString(msg: Message): String = def messageToString(msg: Message): String =
msg match { msg match {
case p: ParameterizedMessage => p.getFormattedMessage case p: ParameterizedMessage => p.getFormattedMessage
case r: RingBufferLogEvent => r.getFormattedMessage case r: RingBufferLogEvent => r.getFormattedMessage
case o: ObjectMessage => objectToString(o.getParameter) case o: ObjectMessage => objectToString(o.getParameter)
case _ => msg.toString case o: ReusableObjectMessage => objectToString(o.getParameter)
case _ => msg.getFormattedMessage
} }
def objectToString(o: AnyRef): String = def objectToString(o: AnyRef): String =
o match { o match {