Merge pull request #152 from retronym/topic/format

eed3si9n · web-flow · commit 226a543f927d · 2018-03-01T01:19:34.000-05:00
Performance optimizations around logging
diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
@@ -353,8 +353,10 @@ class ConsoleAppender private[ConsoleAppender] (
    * @param msg    The message to format
    * @return The formatted message.
    */
-  private def formatted(format: String, msg: String): String =
-    s"$reset${format}${msg}$reset"
+  private def formatted(format: String, msg: String): String = {
+    val builder = new java.lang.StringBuilder(reset.length * 2 + format.length + msg.length)
+    builder.append(reset).append(format).append(msg).append(reset).toString
+  }
 
   /**
    * Select the right color for the label given `level`.
@@ -388,9 +390,14 @@ class ConsoleAppender private[ConsoleAppender] (
   ): Unit =
     out.lockObject.synchronized {
       message.lines.foreach { line =>
-        val labeledLine =
-          s"$reset[${formatted(labelColor, label)}] ${formatted(messageColor, line)}"
-        write(labeledLine)
+        val builder = new java.lang.StringBuilder(
+          labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3)
+        def fmted(a: String, b: String) = builder.append(reset).append(a).append(b).append(reset)
+        builder.append(reset).append('[')
+        fmted(labelColor, label)
+        builder.append("] ")
+        fmted(messageColor, line)
+        write(builder.toString)
       }
     }
 
diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala
@@ -37,7 +37,7 @@ object ConsoleOut {
         lockObject.print(OverwriteLine)
       lockObject.println(s)
       last = Some(s)
-      current = new java.lang.StringBuffer
+      current.setLength(0)
     }
   }
 
diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala
@@ -25,9 +25,11 @@ class ManagedLogger(
     )
   }
 
+  private val SuccessEventTag = scala.reflect.runtime.universe.typeTag[SuccessEvent]
   // send special event for success since it's not a real log level
   override def success(message: => String): Unit = {
-    infoEvent[SuccessEvent](SuccessEvent(message))
+    infoEvent[SuccessEvent](SuccessEvent(message))(implicitly[JsonFormat[SuccessEvent]],
+                                                   SuccessEventTag)
   }
 
   def registerStringCodec[A: ShowLines: TypeTag]: Unit = {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ object ConsoleOut {`
`37`	`37`	`lockObject.print(OverwriteLine)`
`38`	`38`	`lockObject.println(s)`
`39`	`39`	`last = Some(s)`
`40`		`- current = new java.lang.StringBuffer`
	`40`	`+ current.setLength(0)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,11 @@ class ManagedLogger(`
`25`	`25`	`)`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ private val SuccessEventTag = scala.reflect.runtime.universe.typeTag[SuccessEvent]`
`28`	`29`	`// send special event for success since it's not a real log level`
`29`	`30`	`override def success(message: => String): Unit = {`
`30`		`- infoEvent[SuccessEvent](SuccessEvent(message))`
	`31`	`+ infoEvent[SuccessEvent](SuccessEvent(message))(implicitly[JsonFormat[SuccessEvent]],`
	`32`	`+ SuccessEventTag)`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`def registerStringCodec[A: ShowLines: TypeTag]: Unit = {`