mirror of https://github.com/sbt/sbt.git
parent
faf6348a16
commit
c37f2607f1
|
|
@ -72,7 +72,7 @@ private[sbt] final class CommandExchange {
|
||||||
case None => ()
|
case None => ()
|
||||||
case Some(x) =>
|
case Some(x) =>
|
||||||
commandQueue.add(x)
|
commandQueue.add(x)
|
||||||
slurpMessages
|
slurpMessages()
|
||||||
}
|
}
|
||||||
slurpMessages()
|
slurpMessages()
|
||||||
Option(commandQueue.poll) match {
|
Option(commandQueue.poll) match {
|
||||||
|
|
@ -99,7 +99,7 @@ private[sbt] final class CommandExchange {
|
||||||
consoleChannel = Some(console0)
|
consoleChannel = Some(console0)
|
||||||
subscribe(console0)
|
subscribe(console0)
|
||||||
}
|
}
|
||||||
val autoStartServerAttr = (s get autoStartServer) match {
|
val autoStartServerAttr = s get autoStartServer match {
|
||||||
case Some(bool) => bool
|
case Some(bool) => bool
|
||||||
case None => true
|
case None => true
|
||||||
}
|
}
|
||||||
|
|
@ -277,13 +277,13 @@ private[sbt] final class CommandExchange {
|
||||||
val toDel: ListBuffer[CommandChannel] = ListBuffer.empty
|
val toDel: ListBuffer[CommandChannel] = ListBuffer.empty
|
||||||
def json: JValue = JObject(
|
def json: JValue = JObject(
|
||||||
JField("type", JString(event.contentType)),
|
JField("type", JString(event.contentType)),
|
||||||
(Vector(JField("message", event.json), JField("level", JString(event.level.toString))) ++
|
Vector(JField("message", event.json), JField("level", JString(event.level.toString))) ++
|
||||||
(event.channelName.toVector map { channelName =>
|
(event.channelName.toVector map { channelName =>
|
||||||
JField("channelName", JString(channelName))
|
JField("channelName", JString(channelName))
|
||||||
}) ++
|
}) ++
|
||||||
(event.execId.toVector map { execId =>
|
(event.execId.toVector map { execId =>
|
||||||
JField("execId", JString(execId))
|
JField("execId", JString(execId))
|
||||||
})): _*
|
}): _*
|
||||||
)
|
)
|
||||||
channels collect {
|
channels collect {
|
||||||
case c: ConsoleChannel =>
|
case c: ConsoleChannel =>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue