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

Pass State to NetworkChannel

This commit is contained in:
Dale Wijnand 2017-01-20 16:35:00 +00:00
parent 1ef59759cc
commit 164b0fe830
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ private[sbt] final class CommandExchange {
def onIncomingSocket(socket: Socket): Unit = def onIncomingSocket(socket: Socket): Unit =
{ {
s.log.info(s"new client connected from: ${socket.getPort}") s.log.info(s"new client connected from: ${socket.getPort}")
val channel = new NetworkChannel(newChannelName, socket) val channel = new NetworkChannel(newChannelName, socket, s)
subscribe(channel) subscribe(channel)
channel.publishEventMessage(ChannelAcceptedEvent(channel.name)) channel.publishEventMessage(ChannelAcceptedEvent(channel.name))
} }

2
main/src/main/scala/sbt/internal/server/NetworkChannel.scala
View File

@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean
import sbt.protocol.{ Serialization, CommandMessage, ExecCommand, EventMessage } import sbt.protocol.{ Serialization, CommandMessage, ExecCommand, EventMessage }
import sjsonnew.JsonFormat import sjsonnew.JsonFormat
final class NetworkChannel(val name: String, connection: Socket) extends CommandChannel { final class NetworkChannel(val name: String, connection: Socket, state: State) extends CommandChannel {
private val running = new AtomicBoolean(true) private val running = new AtomicBoolean(true)
private val delimiter: Byte = '\n'.toByte private val delimiter: Byte = '\n'.toByte
private val out = connection.getOutputStream private val out = connection.getOutputStream