From 5e0b087daa4d6f9e9f68e2bdf9adab438936e37a Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 21 Mar 2016 14:31:07 -0400
Subject: [PATCH] Use logger

---
 .../src/main/scala/sbt/internal/ConsoleChannel.scala     | 2 +-
 .../src/main/scala/sbt/internal/NetworkChannel.scala     | 2 +-
 .../src/main/scala/sbt/internal/server/Server.scala      | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/command/src/main/scala/sbt/internal/ConsoleChannel.scala b/main/command/src/main/scala/sbt/internal/ConsoleChannel.scala
index 8827c866c..8bf214365 100644
--- a/main/command/src/main/scala/sbt/internal/ConsoleChannel.scala
+++ b/main/command/src/main/scala/sbt/internal/ConsoleChannel.scala
@@ -45,7 +45,7 @@ private[sbt] final class ConsoleChannel extends CommandChannel {
         case Some(src) if src != CommandSource.Human =>
           val s = status.state
           s.remainingCommands.headOption map {
-            println(_)
+            System.out.println(_)
           }
         case _ => //
       }
diff --git a/main/command/src/main/scala/sbt/internal/NetworkChannel.scala b/main/command/src/main/scala/sbt/internal/NetworkChannel.scala
index f4a2abc02..597f6e602 100644
--- a/main/command/src/main/scala/sbt/internal/NetworkChannel.scala
+++ b/main/command/src/main/scala/sbt/internal/NetworkChannel.scala
@@ -21,7 +21,7 @@ private[sbt] final class NetworkChannel extends CommandChannel {
       server match {
         case Some(x) => // do nothing
         case _ =>
-          server = Some(Server.start("127.0.0.1", port, onCommand))
+          server = Some(Server.start("127.0.0.1", port, onCommand, s.log))
       }
       s
     }
diff --git a/main/command/src/main/scala/sbt/internal/server/Server.scala b/main/command/src/main/scala/sbt/internal/server/Server.scala
index e8c846de7..72f14d2cc 100644
--- a/main/command/src/main/scala/sbt/internal/server/Server.scala
+++ b/main/command/src/main/scala/sbt/internal/server/Server.scala
@@ -8,6 +8,7 @@ package server
 import java.net.{ SocketTimeoutException, InetAddress, ServerSocket }
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicBoolean
+import sbt.util.Logger
 
 private[sbt] sealed trait ServerInstance {
   def shutdown(): Unit
@@ -15,7 +16,7 @@ private[sbt] sealed trait ServerInstance {
 }
 
 private[sbt] object Server {
-  def start(host: String, port: Int, onIncommingCommand: Command => Unit): ServerInstance =
+  def start(host: String, port: Int, onIncommingCommand: Command => Unit, log: Logger): ServerInstance =
     new ServerInstance {
 
       val lock = new AnyRef {}
@@ -28,11 +29,11 @@ private[sbt] object Server {
           val serverSocket = new ServerSocket(port, 50, InetAddress.getByName(host))
           serverSocket.setSoTimeout(5000)
 
-          println(s"SBT socket server started at $host:$port")
+          log.info(s"sbt server started at $host:$port")
           while (running.get()) {
             try {
               val socket = serverSocket.accept()
-              println(s"New client connected from: ${socket.getPort}")
+              log.info(s"new client connected from: ${socket.getPort}")
 
               val connection = new ClientConnection(socket) {
                 override def onCommand(command: Command): Unit = {
@@ -63,7 +64,7 @@ private[sbt] object Server {
       }
 
       override def shutdown(): Unit = {
-        println("Shutting down server")
+        log.info("shutting down server")
         running.set(false)
       }
     }